From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sat, 21 May 2005 22:27:09 +0000 (-0700)
Subject: Merge of master.kernel.org:/home/rmk/linux-2.6-mmc.git
X-Git-Tag: v2.6.12-rc5~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1808caffaf448f0ad42ba04b25825fc170cf8e44;p=thirdparty%2Fkernel%2Flinux.git

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

1808caffaf448f0ad42ba04b25825fc170cf8e44