From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Mar 2011 22:00:44 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
X-Git-Tag: v2.6.38~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=687530b44de7e0fe70fabb4200d4cabce3af1a0c;p=thirdparty%2Flinux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

687530b44de7e0fe70fabb4200d4cabce3af1a0c