Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Oct 2010 17:18:36 +0000 (10:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Oct 2010 17:18:36 +0000 (10:18 -0700)
commit5a2b3ef4559f3d0ef58cbfb723f528f1c6b2e601
tree3421b2051cec89dcdf98b71f100837698f149ade
parentc9192798b9318a4b3f96c41ae27805cc8b46b7ee
parent1c8cf9c997a4a6b36e907c7ede5f048aeaab1644
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: sdio: fix SDIO suspend/resume regression