tree 42730921102f92a9b7f0d83068c7f90ffb10d22e
parent 7eeac505d912cfe5805290f8f9e293b134e00237
parent b9338a78fc21e980d33c58b31f3bb37cd48a68f6
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1189803724 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1189803724 -0700

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