tree 5fd9f04dbdda368de31fa22d0f8d8b3fb317a0b7
parent 83d722f7e198b034699b1500d98729beff930efd
parent f13d241bc300802a2576dc3e2dfb51492a9a88b4
author Linus Torvalds <torvalds@g5.osdl.org> 1146091502 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1146091502 -0700

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