From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 2 Jul 2005 17:37:50 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~43122
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=86166f9846590fa46f8e24e9346d002e938a8b81;p=firefly-linux-kernel-4.4.55.git

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

86166f9846590fa46f8e24e9346d002e938a8b81