From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jan 2014 02:20:41 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e914e3f48d0f3978d1561ae3668908e4c0262acf;p=linux-beck.git

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull more ARM updates from Russell King:
 "Some further changes for this merge window:
   - fix bug building with gcc 4.6.4 and EABI.
   - fix pgtbl macro with some LPAE configurations
   - fix initrd override - FDT was overriding the command line, and it
     should be the other way around.
   - fix byteswap of instructions in undefined instruction handler
   - add basic support for SolidRun Hummingboard and Cubox-i boards"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: fix building with gcc 4.6.4
  ARM: 7941/2: Fix incorrect FDT initrd parameter override
  ARM: 7947/1: Make pgtbl macro more robust
  ARM: 7946/1: asm: __und_usr_thumb need byteswap instructions in BE case
  ARM: 7930/1: Introduce atomic MMIO modify
  ARM: imx: initial SolidRun Cubox-i support
  ARM: imx: initial SolidRun HummingBoard support
---

e914e3f48d0f3978d1561ae3668908e4c0262acf