From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 3 Feb 2006 23:50:35 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~38274
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1a56f54c351d8d2e276aefc4f4094037c178d6c7;p=firefly-linux-kernel-4.4.55.git

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

1a56f54c351d8d2e276aefc4f4094037c178d6c7