From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=11da3764a7b413c4e66138bd7bdb5bacd11617a6;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.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