pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit

Merge branches 'release' and 'menlo' into release

Conflicts:

drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>

drivers/Kconfig	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/acpi/processor_core.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/acpi/thermal.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/acpi/video.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/acpi/processor.h	diff1 \|	diff2 \|	diff3 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

drivers/Kconfig	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/acpi/processor_core.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/acpi/thermal.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/acpi/video.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/acpi/processor.h	diff1 \|	diff2 \|	diff3 \|	blob \| history