From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 4 May 2006 21:52:27 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8;hp=-c;p=linux-beck.git

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Move set_ios debugging into mmc.c
  [MMC] Correct mmc_request_done comments
  [MMC] PXA: reduce the number of lines PXAMCI debug uses
  [MMC] PXA and i.MX: don't avoid sending stop command on error
  [MMC] extend data timeout for writes
  [ARM] 3485/1: i.MX: MX1 SD/MMC fix of unintentional double start possibility
---

6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8