Merge branch 'linus' into out-of-tree
commit8e57756b2c2be105be9fb0227e1eb3346f7e0a93
authorIngo Molnar <mingo@elte.hu>
Wed, 3 Aug 2011 18:57:51 +0000 (3 20:57 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 3 Aug 2011 18:57:51 +0000 (3 20:57 +0200)
tree6397a7dba827786d90dc444ec1fbf341c8892572
parent361bd8408d9d5a8d28adabff65ae55b74d35447a
parented8f37370d83e695c0a4fa5d5fc7a83ecb947526
Merge branch 'linus' into out-of-tree
drivers/watchdog/Kconfig