Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 05:47:06 +0000 (22:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 05:47:06 +0000 (22:47 -0700)
commit8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6
treea02ec337d6d6e4b30cd0b4d8968116a32c59357c
parent6f3cafce0ed24372084b5648c9e8a6aacbaf9900
parentb44fb7a09e6bb7d77c1b4b402591f6f953c1e51c
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