Merge branch 'cfq-ioc-share' of git://git.kernel.dk/linux-2.6-block