From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 8 Sep 2005 00:02:24 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: firefly_0821_release~41698
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=24c83d45d76303db8325b8553a05c69c838ef370;p=firefly-linux-kernel-4.4.55.git

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

24c83d45d76303db8325b8553a05c69c838ef370