Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Mar 2011 22:00:44 +0000 (14:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Mar 2011 22:00:44 +0000 (14:00 -0800)
commit687530b44de7e0fe70fabb4200d4cabce3af1a0c
tree0ffb4bedbd51c89c1456fc38319c598ecb203df0
parent78833dd70602be6b71ef34225f708b1e500947dc
parentbad3babace2ee4d1763b4016a662a5c660ab92e9
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 CONFIG_MMC_UNSAFE_RESUME regression