From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 29 Oct 2005 21:02:16 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~40855^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=be15cd72d256e5eb3261a781b8507fac83ab33f6;hp=-c;p=firefly-linux-kernel-4.4.55.git

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

be15cd72d256e5eb3261a781b8507fac83ab33f6