From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 19 Nov 2005 23:21:51 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~39895
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=29ac878a71d1900cc2e283819b1daa388961ab6e;p=firefly-linux-kernel-4.4.55.git

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

29ac878a71d1900cc2e283819b1daa388961ab6e