From: Linus Torvalds Date: Thu, 28 Sep 2006 21:23:55 +0000 (-0700) Subject: Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc X-Git-Tag: v2.6.19-rc1~886 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fecf3404f4aba6d0edeba31eeb018cbb6326dff2;p=linux-2.6-omap-h63xx.git Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc * 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Don't check READY_FOR_DATA when reading [MMC] MMC_CAP_BYTEBLOCK flag for non-log2 block sizes capable hosts [MMC] Add multi block-write capability [MMC] Remove data->blksz_bits member [MMC] Convert mmci to use data->blksz rather than data->blksz_bits --- fecf3404f4aba6d0edeba31eeb018cbb6326dff2