aboutsummaryrefslogtreecommitdiff
path: root/firmware/r128
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-20 18:31:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-20 18:31:34 -0800
commit11da3764a7b413c4e66138bd7bdb5bacd11617a6 (patch)
treed93f68061a4c1e1a927e8c52d80f93396a076829 /firmware/r128
parent50345f1ea9cda4618d9c26e590a97ecd4bc7ac75 (diff)
parent61074287c2965edf0fc75b54ae8f4ce99f182669 (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
Diffstat (limited to 'firmware/r128')
0 files changed, 0 insertions, 0 deletions