From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 12 Jan 2006 20:22:17 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.16-rc1~181
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2b421fee37d34c09bd2a14d3e9294f838c64370;p=linux-2.6

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

a2b421fee37d34c09bd2a14d3e9294f838c64370