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)
commit1d2a1959fe534279cf37aba20b08c24c20840e52
tree67c0b9aa7fe22a44bf0b4af88947799203eb8f67
parent5a79ce76e9bb8f4b2cd8106ee36d15ee05013bcf
parent054cfaacf88865bff1dd58d305443d5d6c068a08
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into sh-latest
drivers/watchdog/Kconfig