]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcbfd16 134edca)
Merge remote-tracking branch 'watchdog/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 01:23:55 +0000 (12:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 01:23:55 +0000 (12:23 +1100)
Conflicts:
drivers/watchdog/iTCO_wdt.c


Trivial merge
Linux kernel for KaRo TX COM modules