]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
authorLinus Torvalds <torvalds@home.osdl.org>
Tue, 20 Jan 2004 06:57:49 +0000 (22:57 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Tue, 20 Jan 2004 06:57:49 +0000 (22:57 -0800)
into home.osdl.org:/home/torvalds/v2.5/linux

1  2 
drivers/video/Kconfig

Simple merge