pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 26b6f22 dd8cd77)

author	Len Brown <len.brown@intel.com>
	Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)
committer	Len Brown <len.brown@intel.com>
	Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)
commit	060195500e0347a6ba8ea89739a9898961eb6f2b
tree	5afba4e8daae642d33b7a4daa97d63c54776b786	tree \| snapshot
parent	26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7	commit \| diff
parent	dd8cd7793781c87be47bbfee65efa3fb5110f898	commit \| diff

Merge branches 'release' and 'wmi-2.6.25' into release

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/acpi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
include/linux/acpi.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.