]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'watchdog/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Aug 2011 02:03:56 +0000 (12:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Aug 2011 02:03:56 +0000 (12:03 +1000)
commit085eca5845bc8fff6909838c32dad9c00ff8a802
tree01916646ccbb52dde2becbb72b02396f46f27f16
parent94d918481c76825d9451baddc132d0c81f29334c
parent1c8450c8bb59b87c2fe8fdc9197c731182bb32b9
Merge remote-tracking branch 'watchdog/master'

Conflicts:
drivers/watchdog/nv_tco.c