tree b96d5fc7809b1374b76a588741d605c75820810b
parent 5b1cbac37798805c1fee18c8cebe5c0a13975b17
parent bdf800c4fceb6d8dbe65471d214eb44a61f5bfc9
author Linus Torvalds <torvalds@linux-foundation.org> 1329171259 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1329171259 -0800

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