Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Thu, 17 Mar 2011 07:44:08 +0000 (16:44 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 17 Mar 2011 07:44:08 +0000 (16:44 +0900)
1  2 
drivers/watchdog/Kconfig

Simple merge