Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2011 01:36:47 +0000 (18:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2011 01:36:47 +0000 (18:36 -0700)
commit477de0de446210eb5c87e2a54c9ba4c8844fb98b
tree399098973886cd595d33b375cefd022b9461c88c
parentb5e6ab589d570ac79cc939517fab05c87a23c262
parent86f315bbb2374f1f077500ad131dd9b71856e697
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:
  Revert "mmc: fix a race between card-detect rescan and clock-gate work instances"