]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'watchdog_mxs' of git://git.pengutronix.de/git/wsa/linux
authorWim Van Sebroeck <wim@iguana.be>
Wed, 30 Jan 2013 20:41:48 +0000 (21:41 +0100)
committerWim Van Sebroeck <wim@iguana.be>
Wed, 30 Jan 2013 20:41:48 +0000 (21:41 +0100)
1  2 
drivers/watchdog/Kconfig

Simple merge