Merge branch 'master'

arch/i386/kernel/smpboot.c

arch/i386/mm/ioremap.c

arch/i386/pci/direct.c

arch/i386/pci/mmconfig.c

arch/i386/pci/pci.h

arch/x86_64/ia32/ia32_binfmt.c

arch/x86_64/kernel/smpboot.c

arch/x86_64/kernel/time.c

arch/x86_64/mm/ioremap.c

arch/x86_64/mm/numa.c

arch/x86_64/pci/mmconfig.c

drivers/block/cciss.c

drivers/char/drm/radeon_cp.c

drivers/net/skge.c

drivers/video/cfbcopyarea.c

drivers/video/cfbfillrect.c

drivers/video/cfbimgblt.c

drivers/video/console/fbcon.c

drivers/video/fbmem.c

include/linux/fb.h