Merge branch 'pandora-27-omap1' into pandora-27-omap1_rework

diff --cc drivers/acpi/thermal.c
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/mmc/core/core.c
Simple merge

diff --cc drivers/usb/musb/Kconfig
Simple merge

diff --cc drivers/usb/musb/musb_core.c
Simple merge

diff --cc sound/soc/omap/omap-pcm.c
Simple merge