Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27
authorAndi Kleen <ak@linux.intel.com>
Thu, 4 Sep 2008 12:33:03 +0000 (14:33 +0200)
committerAndi Kleen <ak@linux.intel.com>
Thu, 4 Sep 2008 12:33:03 +0000 (14:33 +0200)

Trivial merge