Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into ppc970.osdl.org:/home/torvalds/v2.6/linux

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/Makefile
Simple merge

diff --cc drivers/video/fbmem.c
Simple merge

diff --cc include/asm-arm/arch-pxa/pxa-regs.h
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge