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
parent54cd3148a149f7413cc25cb832f42cf0dabcee29 (diff)
parent266feefeb9ea2d846ac82eb6db1a54b230364ba4 (diff)
parentd8196a93b1ce9a5abb410f39f9375912c9e53675 (diff)
downloadlinux-4fd23436f1f414fea9a1a6050d4ed6de02cb91e5.tar.bz2
Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27