From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Dec 2011 02:31:34 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
X-Git-Tag: v3.2-rc7~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11da3764a7b413c4e66138bd7bdb5bacd11617a6;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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: vub300: fix type of firmware_rom_wait_states module parameter
  Revert "mmc: enable runtime PM by default"
  mmc: sdhci: remove "state" argument from sdhci_suspend_host
---

11da3764a7b413c4e66138bd7bdb5bacd11617a6