]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'watchdog/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:23:20 +0000 (14:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:23:20 +0000 (14:23 +1100)
commita88a8e680454437fcdab68e55e6bfa153d893792
tree67255e100d8c6d4e800aa5723caeeef9bff00f47
parent2dfaad4e18c12a321206f509374d102a3dec0db7
parent144ff55a8294029707f367a674826c634c637866
Merge remote-tracking branch 'watchdog/master'

Conflicts:
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
drivers/watchdog/Kconfig
drivers/watchdog/Makefile