git.stricted.de - GitHub/LineageOS/android_kernel_samsung_universal7580.git/commit

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3834f47 78f28b7)

author	Len Brown <len.brown@intel.com>
	Sat, 19 Sep 2009 04:11:26 +0000 (00:11 -0400)
committer	Len Brown <len.brown@intel.com>
	Sat, 19 Sep 2009 04:11:26 +0000 (00:11 -0400)
commit	c602c65b2f81d14456771d1e3f15d1381f4b7efa
tree	f1f833c8dd6c1519eeb101be32f7fe54a9605af5	tree \| snapshot (tar.gz zip)
parent	3834f47291df475be3f0f0fb7ccaa098967cc054	commit \| diff
parent	78f28b7c555359c67c2a0d23f7436e915329421e	commit \| diff

Merge branch 'linus' into sfi-release

Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/blacklist.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/pci_root.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/power.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/video.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/dmar.c	diff1 \|	diff2 \|	blob \| history
include/acpi/acpi_bus.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history