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

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

a4936044001694f033fe4ea94d6034d51a6b465c