Merge branch 'linus'
commit12feb8646933cd969baa696eb3b30414e2f62583
authorIngo Molnar <mingo@elte.hu>
Wed, 3 Aug 2011 17:27:59 +0000 (3 19:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 3 Aug 2011 17:27:59 +0000 (3 19:27 +0200)
tree05829a6ed603ed969e370722981052ba580d891b
parent500b60f54f7d067973827c33ad03d438308ba06e
parented8f37370d83e695c0a4fa5d5fc7a83ecb947526
Merge branch 'linus'
drivers/watchdog/Kconfig