From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 14 Sep 2007 21:02:04 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v3.12-rc1~26907
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6455c66a8750170c2b4a41c6f6c53310a49e08ce;p=kernel%2Fkernel-generic.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4567/1: Fix 'Oops - undefined instruction' when CONFIG_VFP=y on non VFP device
  [ARM] realview: disable second GIC on RevB MPCore platforms
---

6455c66a8750170c2b4a41c6f6c53310a49e08ce