]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'watchdog/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:57:21 +0000 (13:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:57:21 +0000 (13:57 +1100)
1  2 
arch/arm/configs/bcm_defconfig

Simple merge