tree f956ebeec64d7c4249a8886585dc8416e51d72a3
parent a12587b00388d1694933252e97abca237bc3a6b8
parent a61c2332f8e1939cd4984b63cab641b2366eb428
author Linus Torvalds <torvalds@linux-foundation.org> 1326756884 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326756884 -0800

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