From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 1 Dec 2005 23:53:33 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~39725
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ca98f825ea05edb41346f12408caa30be8a287c6;p=firefly-linux-kernel-4.4.55.git

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

ca98f825ea05edb41346f12408caa30be8a287c6