Merge branch 'thinkpad' into test
commit0ca9413c234aa5a49ffaf80e46b50721a752e45a
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:28:48 +0000 (22 23:28 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:28:48 +0000 (22 23:28 -0400)
tree2337ac22810f77c0ddb9b00391feab31175c0bd2
parentacd41d36e5a813501da92156f325ce15ddcd58ff
parentd64c81c4cea0a14e88fc76e2c845e4885e491754
Merge branch 'thinkpad' into test
drivers/misc/thinkpad_acpi.c