Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2...
authorAndi Kleen <ak@linux.intel.com>
Mon, 21 Jul 2008 22:16:54 +0000 (00:16 +0200)
committerAndi Kleen <ak@linux.intel.com>
Mon, 21 Jul 2008 22:16:54 +0000 (00:16 +0200)

Trivial merge