From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 21 Oct 2005 19:23:07 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~39870^2~6^2~53
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2c86c83bf4e7fa1ef0d625e297607dc5d0d94dd4;p=firefly-linux-kernel-4.4.55.git

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

2c86c83bf4e7fa1ef0d625e297607dc5d0d94dd4