From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 24 Jun 2005 00:19:56 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~42711^2~435
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=adb7ee3746b579a7fa7af7c4ec2c8164bc910ed4;p=firefly-linux-kernel-4.4.55.git

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

adb7ee3746b579a7fa7af7c4ec2c8164bc910ed4