From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 12 Jan 2006 20:23:03 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: firefly_0821_release~38916
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b87e1baff24e586c3fe6c168843d213119bf4dd;p=firefly-linux-kernel-4.4.55.git

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

8b87e1baff24e586c3fe6c168843d213119bf4dd