From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 31 Oct 2005 01:48:00 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~39876^2~72^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1480d0a31db62b9803f829cc0e5cc71935ffe3cc;p=firefly-linux-kernel-4.4.55.git

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

1480d0a31db62b9803f829cc0e5cc71935ffe3cc