From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 29 Jul 2005 16:47:08 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
X-Git-Tag: firefly_0821_release~42584
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ca49a601c2b4b74e5cf57fef62122204d1982372;p=firefly-linux-kernel-4.4.55.git

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

ca49a601c2b4b74e5cf57fef62122204d1982372