Merge branch 'bq27x00-for-upstream' of git://git.metafoo.de/linux-2.6