]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94c12cc 2ed6d22)
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 28 Sep 2006 21:23:55 +0000 (14:23 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 28 Sep 2006 21:23:55 +0000 (14:23 -0700)
* '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


Trivial merge
Linux 2.6 source tree