From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 26 Apr 2006 22:45:02 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~35968
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=58f8236bed448273cd7f9ae02c09467853303484;p=firefly-linux-kernel-4.4.55.git

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
---

58f8236bed448273cd7f9ae02c09467853303484