From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 21 Mar 2013 16:33:01 +0000 (+0100)
Subject: Merge tag 'ux500-core-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: firefly_0821_release~3680^2~605^2~23
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f965ebdab662082e3419f5868bb2915fe5cc9a43;p=firefly-linux-kernel-4.4.55.git

Merge tag 'ux500-core-v3.10' of git://git./linux/kernel/git/linusw/linux-stericsson into next/soc

From Linus Walleij <linus.walleij@linaro.org>:

Two fixes to the ux500 core machine:
- Enable the 128KB cache on DB8540
- Bump the number of IRQs to the correct value

* tag 'ux500-core-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: mach-ux500: enable 128KB way L2 cache on DB8540
  ARM: ux500: bump arch nr of GPIOs

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

f965ebdab662082e3419f5868bb2915fe5cc9a43