From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 7 Nov 2005 00:57:34 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: firefly_0821_release~40841
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=085f20e481190cd0597d72ec49bffc07bda4c9be;p=firefly-linux-kernel-4.4.55.git

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

085f20e481190cd0597d72ec49bffc07bda4c9be