]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm-current/fixes'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 15 Jan 2014 23:06:49 +0000 (10:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 15 Jan 2014 23:06:49 +0000 (10:06 +1100)
1  2 
arch/arm/mach-highbank/highbank.c
arch/arm/mach-omap2/omap4-common.c

Simple merge
Simple merge