Merge branch 'thinkpad-2.6.33' into release
commit7458bbd044f0e799ad27c3fc71e1115ac30a9c25
authorLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 05:00:54 +0000 (16 00:00 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 05:00:54 +0000 (16 00:00 -0500)
tree4c9a320613722421f49b53266abcc64f90471f91
parent1667e399a41be976c9d37bf02aa477979df111d2
parent5d2eb14d36723eba0b31ae208bc346835751e944
Merge branch 'thinkpad-2.6.33' into release
drivers/platform/x86/thinkpad_acpi.c