Merge branch 'upstream'
[linux-2.6] / include / asm-sparc / vga.h
2006-04-12  Jeff GarzikMerge branch 'upstream'
2006-04-11  Jeff GarzikMerge branch 'master'
2006-04-11  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-04-11  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-04-11  Linus TorvaldsMerge branch 'splice' of git://brick.kernel.dk/data...
2006-04-11  Andrew Morton[PATCH] sparc32 vga support