]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'dock' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:25:26 +0000 (23:25 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:25:26 +0000 (23:25 -0400)
commit47bf31adc541bef0c20de15e800e0011f1ae70c7
tree28903879a8570eaefa57942ec3d475d365f5a465
parent4538fad56ee1c16bce0294b5647d2551f0e03164
parent0a918a9432cc30aede10f904253b66ea6ab485ac
Merge branch 'dock' into test

Conflicts:
drivers/acpi/osl.c

Signed-off-by: Len Brown <len.brown@intel.com>
MAINTAINERS
drivers/acpi/bus.c
drivers/acpi/osl.c
include/acpi/acpi_drivers.h