From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 11 Nov 2005 17:22:08 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.15-rc1~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c;p=linux-2.6

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

b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c