From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sat, 18 Jun 2005 23:06:50 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~40856^2~21^2~224
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3aa3dfb372576f30835a94409556e3c8681b5756;p=firefly-linux-kernel-4.4.55.git

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

3aa3dfb372576f30835a94409556e3c8681b5756