review.tizen.org Git - platform/kernel/kernel-mfld-blackbay.git/commit

projects / platform / kernel / kernel-mfld-blackbay.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b963bd3 df43176)

author	Len Brown <len.brown@intel.com>
	Sat, 19 Sep 2009 06:14:45 +0000 (02:14 -0400)
committer	Len Brown <len.brown@intel.com>
	Sat, 19 Sep 2009 06:14:45 +0000 (02:14 -0400)
commit	d26f0528d588e596955bf296a609afe52eafc099
tree	314f7a5637d5517a19f29d64a17e3459505def8f	tree \| snapshot
parent	b963bd39c9000328f6ce4f12aa52abbb0c68ee91	commit \| diff
parent	df43176c934f2bc01f7615a6e20a4b8e77dcdd11	commit \| diff

Merge branch 'misc-2.6.32' into release

Conflicts:
drivers/pci/dmar.c

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

drivers/acpi/bus.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/ec.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/pci_slot.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/video.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/dmar.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/hp-wmi.c	diff1 \|	diff2 \|	blob \| history
include/linux/acpi.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;