From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Feb 2012 22:14:19 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Tag: v3.3-rc4~30
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ed5016d772b84348cb86ab3cdbc533bd4812f2bb;p=users%2Fhch%2Fxfs.git

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7322/1: Print BUG instead of undefined instruction on BUG_ON()
  ARM: 7321/1: cache-v7: Disable preemption when reading CCSIDR
  ARM: 7320/1: Fix proc_info table alignment
---

ed5016d772b84348cb86ab3cdbc533bd4812f2bb