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