Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block