tree 77a9f87265c97e0df5449fe6888df393f028aea2
parent 13c07b0286d340275f2d97adf085cecda37ede37
parent 9811ccdfa94b4773c8030569bd8ec75eafa485ac
author Linus Torvalds <torvalds@linux-foundation.org> 1323797303 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323797303 -0800

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

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: 7204/1: arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier
  ARM: 7185/1: perf: don't assign platform_device on unsupported CPUs
  ARM: 7187/1: fix unwinding for XIP kernels
  ARM: 7186/1: fix Kconfig issue with PHYS_OFFSET and !MMU