]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh...
authorPaul Mundt <lethal@linux-sh.org>
Wed, 26 Jan 2011 09:24:18 +0000 (18:24 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 26 Jan 2011 09:24:18 +0000 (18:24 +0900)
1  2  3 
drivers/watchdog/Kconfig
drivers/watchdog/shwdt.c

Simple merge
Simple merge