Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Jul 2006 23:38:30 +0000 (16:38 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Jul 2006 23:38:30 +0000 (16:38 -0700)
commit300c215acd2462223a6595d3562dad67d0e10afd
tree3fd31750a36471dcb8ba0c61b5ba2d97a8dbe5c7
parent7b69a4c360e8787877ebf5e42609b8bab13afa6a
parent8b1b21853bab15fe5b60b8222786fe036c4dc365
Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Change SDHCI version error to a warning
  [MMC] Fix incorrect register access