summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/Kconfig
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-01-26 10:24:18 +0100
committerPaul Mundt <lethal@linux-sh.org>2011-01-26 10:24:18 +0100
commite8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd (patch)
treed037f30224ad11cc4875ff9868d9bc983bd3522a /drivers/watchdog/Kconfig
parentwatchdog: shwdt: driver model conversion. (diff)
parentsh: pci: Support asynchronous initialization of SH-X3 PCIe channels. (diff)
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff)
downloadlinux-e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd.tar.xz
linux-e8cdfb0509f48d44d95d68d4f42d8d71a9ba4acd.zip
Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest