Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes