review.tizen.org Git - kernel/kernel-generic.git/commit

projects / kernel / kernel-generic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 71fd68e e55a599)

author	Len Brown <len.brown@intel.com>
	Sat, 19 Sep 2009 04:37:13 +0000 (00:37 -0400)
committer	Len Brown <len.brown@intel.com>
	Sat, 19 Sep 2009 04:37:13 +0000 (00:37 -0400)
commit	003d6a38ce1a59e0053a02fd9e9a65b588bc8e33
tree	c9b941f4798a2accca200b0b01c07353ce5b07e1	tree \| snapshot
parent	71fd68e7d234f6b7d8407c8f486764d24f8411f4	commit \| diff
parent	e55a5999ffcf72dc4d43d73618957964cb87065a	commit \| diff

Merge branch 'sfi-base' into release

Conflicts:
drivers/acpi/power.c

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

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

Domain: System / Uncategorized;