Merge branch 'pandora-27-omap1' into pandora-27-omap1_rework
authorGrazvydas Ignotas <notasas@gmail.com>
Fri, 7 May 2010 14:03:11 +0000 (17:03 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Fri, 7 May 2010 14:03:11 +0000 (17:03 +0300)
commita0a25e6fd8c1f53602d73f818e327cbb29e2ba86
tree752842056fded9e015e60a02d06ba417d65bca08
parent2f27532760a4d2b984ed4263afc558dd1f3185dc
parenta433c30f50f0ba9622fe33c8d9263d755f2c71d6
Merge branch 'pandora-27-omap1' into pandora-27-omap1_rework
drivers/acpi/thermal.c
drivers/misc/Kconfig
drivers/mmc/core/core.c
drivers/usb/musb/Kconfig
drivers/usb/musb/musb_core.c
sound/soc/omap/omap-pcm.c