From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 12 Dec 2005 23:25:15 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.15-rc6~104
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5;p=linux-2.6

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

7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5