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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 4538fad 0a918a9)

author	Len Brown <len.brown@intel.com>
	Thu, 23 Oct 2008 03:25:26 +0000 (23:25 -0400)
committer	Len Brown <len.brown@intel.com>
	Thu, 23 Oct 2008 03:25:26 +0000 (23:25 -0400)
commit	47bf31adc541bef0c20de15e800e0011f1ae70c7
tree	28903879a8570eaefa57942ec3d475d365f5a465	tree \| snapshot
parent	4538fad56ee1c16bce0294b5647d2551f0e03164	commit \| diff
parent	0a918a9432cc30aede10f904253b66ea6ab485ac	commit \| diff

Merge branch 'dock' into test

Conflicts:
drivers/acpi/osl.c

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/acpi/bus.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/osl.c	diff1 \|	diff2 \|	blob \| history
include/acpi/acpi_drivers.h	diff1 \|	diff2 \|	blob \| history

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