Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...
authorLen Brown <len.brown@intel.com>
Mon, 15 Mar 2010 01:30:17 +0000 (21:30 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Mar 2010 01:30:17 +0000 (21:30 -0400)
commitec28dcc6b4c00b78ad269ad5b85ebd5c2d504825
tree6170f5c33200f7fb32ef5fda87a0ae923fe81341
parentc67fcd670b55e89e0c129fbf7fae854bd1f8bfa6
parentd06070509147c948a06056da619c9dc2ed349805
parentf6bb13aa1ea3bb26a4c783822347873f085b9000
parent0c99c5288eb9b1bbc9684b0ec0fd7efc578749b3
parent4c81ba4900ab4eb24c7d2ba1aca594c644b6ce4c
parent7e0e9c042790d4ea44c6a00ddaad8b8bbcc3f17f
parent149fe9c293f76803206648270ca24fc2604d5f01
parentcffdde993a016bedbc2f5eb60d00c3a766ffb612
parentfa80945269f312bc609e8384302f58b03c916e12
parent8b7ef6d8f16274da42344cd50746ddb1c93c25ea
parent70287db87cfc968fe78bf82a489833cc77b84352
parent38bcb37a6f63fcdfcc0dd0af3ec5c03a4b7be48e
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release
13 files changed:
arch/x86/kernel/acpi/boot.c
drivers/acpi/acpica/exmutex.c
drivers/acpi/battery.c
drivers/acpi/bus.c
drivers/acpi/ec.c
drivers/acpi/internal.h
drivers/acpi/processor_throttling.c
drivers/acpi/sbs.c
drivers/acpi/sleep.c
drivers/acpi/thermal.c
drivers/acpi/utils.c
drivers/acpi/video.c
drivers/platform/x86/sony-laptop.c