From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 18 Jan 2006 23:19:40 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: firefly_0821_release~38718
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2149bcabc5f6fd635935d57480044ba4c11bc020;p=firefly-linux-kernel-4.4.55.git

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

2149bcabc5f6fd635935d57480044ba4c11bc020