Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Dec 2011 02:31:34 +0000 (18:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Dec 2011 02:31:34 +0000 (18:31 -0800)
* '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


Trivial merge