From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 8 Sep 2005 22:28:16 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.14-rc1~492^2~25
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63068465fa9ba8258e341f70c07cd2221b8c114d;p=linux-2.6

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

63068465fa9ba8258e341f70c07cd2221b8c114d