diff options
author | Tony Lindgren <tony@atomide.com> | 2010-10-08 19:19:53 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 19:19:53 +0200 |
commit | 73c5ef126f40b0b872e5964ff65dbe792eeec493 (patch) | |
tree | 064ab090a0b8cdda4f542ecd308c17fcee349aae /drivers/mmc | |
parent | Merge branch 'pm-next-2' of ssh://master.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | OMAP1: Amstrad Delta: add camera controlled LEDS trigger (diff) | |
parent | omap4 hsmmc: Update ocr mask for MMC2 for regulator to use (diff) | |
download | linux-73c5ef126f40b0b872e5964ff65dbe792eeec493.tar.xz linux-73c5ef126f40b0b872e5964ff65dbe792eeec493.zip |
Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus