Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
[safe/jmp/linux-2.6] / arch / x86 / include / asm / fb.h
2010-02-17 Dave Airliex86-64: Allow fbdev primary video code
2008-10-23 H. Peter Anvinx86: Fix ASM_X86__ header guards
2008-10-23 Al Virox86, um: ... and asm-x86 move