From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 25 Apr 2005 23:19:32 +0000 (-0700)
Subject: Automated merge of kernel.org:/home/rmk/linux-2.6-rmk.git
X-Git-Tag: firefly_0821_release~43479
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ab2fd30b668b1687a9ca9e9ea0b60145deeafe84;p=firefly-linux-kernel-4.4.55.git

Automated merge of /home/rmk/linux-2.6-rmk.git
---

ab2fd30b668b1687a9ca9e9ea0b60145deeafe84