From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 1 Jul 2005 00:04:54 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: firefly_0821_release~43128
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d471cd4787351c05d6be749475418ccea2720ef4;p=firefly-linux-kernel-4.4.55.git

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

d471cd4787351c05d6be749475418ccea2720ef4