]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit553fb1765b0359693a2bb8c8bd62be4ae0f13745
tree9e60c2fc42e9c542b699b748c908a66ce42f74ee
parentfcbfd16afc8e584922738f0fa33e0308bdca9869
parent134edca0995bd71d9d016954c95f17882b8e725e
Merge remote-tracking branch 'watchdog/linux-next'

Conflicts:
drivers/watchdog/iTCO_wdt.c