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)
commite8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd
treed037f30224ad11cc4875ff9868d9bc983bd3522a
parent8f5585ec3d173819dd7e751f661c33af39d7ec60
parent1da09c43ce5f4fcd98143feb7d2513fe6fd62848
parent6b620478e58677bb3f4ec884abb29ef9d68c7821
Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest
drivers/watchdog/Kconfig
drivers/watchdog/shwdt.c