Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 06:32:20 +0000 (15:32 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 06:32:20 +0000 (15:32 +0900)
1  2 
drivers/video/Kconfig

Simple merge