From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Dec 2011 17:28:23 +0000 (-0800)
Subject: Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur... 
X-Git-Tag: v3.2-rc6~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=442ee5a942834431ccf0b412e3cf7bb9ae97ff4e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'fixes' of 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
---

442ee5a942834431ccf0b412e3cf7bb9ae97ff4e