From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 23 Jun 2006 05:47:06 +0000 (-0700)
Subject: Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.18-rc1~1081^2~220
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6

Merge branch 'devel' of /home/rmk/linux-2.6-mmc

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
  [ARM] 3565/1: AT91RM9200 MMC update
  [MMC] Convert all hosts except mmci to use data->blksz
---

8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6