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