From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 10 Jul 2005 19:57:49 +0000 (-0700)
Subject: Merge master.kernel.org:~rmk/linux-2.6-arm.git
X-Git-Tag: firefly_0821_release~42864
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5c23804a0941a111752fdacefe0bea2db1b4d93f;p=firefly-linux-kernel-4.4.55.git

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

5c23804a0941a111752fdacefe0bea2db1b4d93f