]> git.hungrycats.org Git - linux/commit
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 15 May 2004 09:31:31 +0000 (02:31 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 15 May 2004 09:31:31 +0000 (02:31 -0700)
commit18857d8ea02330d7f0ffa8f2bc7749fd4a2fd497
treea753cc683d6e71c948e1dd086fe8798e68cb0028
parent73b5d1641f80f5508ae1098ff5eb9a687fa8571f
parentcd594a3b6da2dd1dcb23d01e5453b0eb4d9fe09b
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
drivers/video/Kconfig
drivers/video/Makefile
drivers/video/fbmem.c
include/asm-arm/arch-pxa/pxa-regs.h
include/linux/pci_ids.h