Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Dec 2010 19:22:58 +0000 (11:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Dec 2010 19:22:58 +0000 (11:22 -0800)
commit92a8cd42673f119896df7e964976c18952eb9970
tree9292f8cc0c2259f354d5d122a9d85371c3dde7a0
parent88a58101608f1416f4c1ec81d88faed258a34b3d
parent274476f8fe0b6ac9bac542cc39de12c3dd0f43f6
Merge branch 'for-linus' of git://git./linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: Fix re-probing with PM_POST_RESTORE notification
  mmc: atmel-mci: fix multiblock SDIO transfers
  mmc: at91_mci: fix multiblock SDIO transfers