diff options
author | Andi Kleen <ak@linux.intel.com> | 2008-09-04 14:33:03 +0200 |
---|---|---|
committer | Andi Kleen <ak@linux.intel.com> | 2008-09-04 14:33:03 +0200 |
commit | 4fd23436f1f414fea9a1a6050d4ed6de02cb91e5 (patch) | |
tree | 687485fbe97ce053af50b80871777d9f36f4e0c5 /drivers/misc | |
parent | ACPI: Make Len Brown the ACPI maintainer again (diff) | |
parent | ACPI: Avoid bogus timeout about SMbus check (diff) | |
parent | fujitsu-laptop: fix regression for P8010 in 2.6.27-rc (diff) | |
download | linux-4fd23436f1f414fea9a1a6050d4ed6de02cb91e5.tar.xz linux-4fd23436f1f414fea9a1a6050d4ed6de02cb91e5.zip |
Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27