From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 18 Oct 2005 15:41:06 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~39876^2~50^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d846a92e4ec26112fbe41c4e45ddd9119cd74cda;p=firefly-linux-kernel-4.4.55.git

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

d846a92e4ec26112fbe41c4e45ddd9119cd74cda