From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Dec 2005 00:43:13 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~38603^2~21
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d898d485e721db45be555c27df5de03281f2fd05;p=firefly-linux-kernel-4.4.55.git

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

d898d485e721db45be555c27df5de03281f2fd05