]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
Merge branches 'release' and 'hwmon-conflicts' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:31:17 +0000 (03:31 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:31:17 +0000 (03:31 -0500)
commit299cfe38081bea6dcd8b882375f6f65a980bccf9
treee567c1e908d158d6dce155cc5cf1b4eb8c78c514
parent8976b6fd7a0060f72e20d5cec833c03d50874cd1
parent443dea72d5f428170de6d6e3c4c1a1e2b7632b65
Merge branches 'release' and 'hwmon-conflicts' into release
drivers/acpi/osl.c
include/acpi/acpiosxf.h
include/linux/acpi.h