| commit | 11da3764a7b413c4e66138bd7bdb5bacd11617a6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 20 18:31:34 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 20 18:31:34 2011 -0800 |
| tree | d93f68061a4c1e1a927e8c52d80f93396a076829 | |
| parent | 50345f1ea9cda4618d9c26e590a97ecd4bc7ac75 [diff] | |
| parent | 61074287c2965edf0fc75b54ae8f4ce99f182669 [diff] |
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: 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