Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6