Merge branch 'docs' of git://git.lwn.net/linux-2.6