]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ux500-core/ux500-core'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 00:36:10 +0000 (10:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 00:36:10 +0000 (10:36 +1000)
commita73efc12096027c36296b2a2718c461ba76e792c
treec90b303c78289bcc41a41adf21a35143ecfee0cd
parent39eacb1f426f0de7fa2be2065a736b36bb0fb253
parentdfd86a06d1dd84e7b1086c6e88adf9a9bb1c3af3
Merge remote-tracking branch 'ux500-core/ux500-core'

Conflicts:
arch/arm/mach-ux500/cache-l2x0.c