From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 9 Jan 2006 23:08:33 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: firefly_0821_release~39398
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8e9c238c3884c226f0cddc31cde87dd5df1a6500;p=firefly-linux-kernel-4.4.55.git

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

8e9c238c3884c226f0cddc31cde87dd5df1a6500