From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 28 Oct 2005 16:24:22 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~40855^2~35
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=83928e17b92b7a667bfe674f1b330619adc2ac88;p=firefly-linux-kernel-4.4.55.git

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

Minor manual fixups for gfp_t clashes.
---

83928e17b92b7a667bfe674f1b330619adc2ac88