From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jun 2011 15:58:23 +0000 (-0700)
Subject: Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=edcda265225b90c8700b21758fffcba61d19e046;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'fixes' of /home/rmk/linux-2.6-arm

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: pm: ensure ARMv7 CPUs save and restore the TLS register
  ARM: pm: proc-v7: fix missing struct processor pointers for suspend code
  ARM: 6969/1: plat-iop: fix build error
  ARM: 6961/1: zImage: Add build-time check for correctly-sized proc_type entries
  ARM: SMP: wait for CPU to be marked active
  ARM: 6963/1: Thumb-2: Relax relocation requirements for non-function symbols
  ARM: 6962/1: mach-h720x: fix build error
  ARM: 6959/1: SMP build fix for entry-macro-multi.S
---

edcda265225b90c8700b21758fffcba61d19e046