From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Jan 2012 23:34:44 +0000 (-0800)
Subject: Merge branch 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm
X-Git-Tag: v3.3-rc1~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b3fcfed35735af507be36a4c3f3bbeb9bc7bbf6;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm

* 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm:
  ARM: sa11x0: assabet: fix build warning
  ARM: Add arm_memblock_steal() to allocate memory away from the kernel
  ARM: 7275/1: LPAE: Check the CPU support for the long descriptor format
  ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97
  ARM: 7272/1: S3C24XX: Fix build error for missing <mach/system-reset.h>
  ARM: 7271/1: Fix typo in conversion of ARCH_NR_GPIOS to Kconfig
---

5b3fcfed35735af507be36a4c3f3bbeb9bc7bbf6