Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27