err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e5e54bc e5e54bc 3c60284)

author	Len Brown <len.brown@intel.com>
	Thu, 7 Feb 2008 08:18:04 +0000 (03:18 -0500)
committer	Len Brown <len.brown@intel.com>
	Thu, 7 Feb 2008 08:18:04 +0000 (03:18 -0500)
commit	26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7
tree	47799c181a82225e5ee9c566b2186224cde06251	tree \| snapshot
parent	e5e54bc86a1fed9849b22fd736c30b23c4719046	commit \| diff
parent	e5e54bc86a1fed9849b22fd736c30b23c4719046	commit \| diff
parent	3c602840528cf1aa835e6e32d76a0a45936b8e4c	commit \| diff

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

Linux 2.6 source tree