Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux...
Russell King [Sat, 23 May 2009 22:18:40 +0000 (23:18 +0100)]
1  2 
drivers/video/Kconfig

Simple merge