Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
commitfecf3404f4aba6d0edeba31eeb018cbb6326dff2
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 28 Sep 2006 21:23:55 +0000 (28 14:23 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 28 Sep 2006 21:23:55 +0000 (28 14:23 -0700)
treef29b18c6e564e515212b6c88e89cf5770cc0f350
parent94c12cc7d196bab34aaa98d38521549fa1e5ef76
parent2ed6d22cec37d9a3df4c5bacf1160dee7700106e
Merge branch 'devel' of /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