From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 9 Jan 2006 23:09:30 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~39396
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3995f4c5327595b51482bdac8c189736262eb6e0;p=firefly-linux-kernel-4.4.55.git

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

3995f4c5327595b51482bdac8c189736262eb6e0