Merge branch 'for-linus' of ../linux-2.6-block into block-for-2.6.39/core