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