git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0f2cb32 731c6ab)

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	b52705c3ab9aa511e65387d8d857f2596c6591a8
tree	f1f833c8dd6c1519eeb101be32f7fe54a9605af5	tree \| snapshot
parent	0f2cb3256eb83dfa87c54a9b8bb45aacb30cce75	commit \| diff
parent	731c6abd479c0437e9cc142d234c81710a450b24	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

Linux Kernel Source Tree.