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)
commit9fb4c7fbbcb1e947567d13b82e429ae47a46e337
tree6c5f11f347d0f58565381f92680a7a9cc63c0bd8
parentdc3e5b6a6e842116ec2436161adf31877f09b6b9
parentd762f4383100c2a87b1a3f2d678cd3b5425655b4
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/video/Kconfig