Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block