]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:32:59 +0000 (09:32 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:33:01 +0000 (09:33 +1000)
1  2 
arch/arm/include/asm/outercache.h

Simple merge