From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Sep 2011 00:36:10 +0000 (+1000)
Subject: Merge remote-tracking branch 'ux500-core/ux500-core'
X-Git-Tag: next-20110923~97
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a73efc12096027c36296b2a2718c461ba76e792c;p=karo-tx-linux.git

Merge remote-tracking branch 'ux500-core/ux500-core'

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

a73efc12096027c36296b2a2718c461ba76e792c