From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 23 Jul 2005 23:59:55 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~42716
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c94c0d201f1c1a62184f4f220c1615347aafbee7;p=firefly-linux-kernel-4.4.55.git

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

c94c0d201f1c1a62184f4f220c1615347aafbee7