From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 28 Nov 2005 23:02:50 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.15-rc3~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cba2fa186146aacde99bba3dcd713552dad5a897;p=linux-2.6

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

cba2fa186146aacde99bba3dcd713552dad5a897