Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit58f8236bed448273cd7f9ae02c09467853303484
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Apr 2006 22:45:02 +0000 (26 15:45 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Apr 2006 22:45:02 +0000 (26 15:45 -0700)
tree5fd9f04dbdda368de31fa22d0f8d8b3fb317a0b7
parent83d722f7e198b034699b1500d98729beff930efd
parentf13d241bc300802a2576dc3e2dfb51492a9a88b4
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] nommu: trivial fixups for head-nommu.S and the Makefile
  [ARM] vfp: fix leak of VFP_NAN_FLAG into FPSCR
  [ARM] 3484/1: Correct AEABI CFLAGS for correct enum handling