summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2008-09-04 14:33:03 +0200
committerAndi Kleen <ak@linux.intel.com>2008-09-04 14:33:03 +0200
commit4fd23436f1f414fea9a1a6050d4ed6de02cb91e5 (patch)
tree687485fbe97ce053af50b80871777d9f36f4e0c5 /drivers/misc
parentACPI: Make Len Brown the ACPI maintainer again (diff)
parentACPI: Avoid bogus timeout about SMbus check (diff)
parentfujitsu-laptop: fix regression for P8010 in 2.6.27-rc (diff)
downloadlinux-4fd23436f1f414fea9a1a6050d4ed6de02cb91e5.tar.xz
linux-4fd23436f1f414fea9a1a6050d4ed6de02cb91e5.zip
Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27