Merge branch 'linus'
commit715b78347708a5b0cf1db53b0170db15fbde9217
authorIngo Molnar <mingo@elte.hu>
Tue, 24 May 2011 07:02:31 +0000 (24 09:02 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 24 May 2011 07:02:31 +0000 (24 09:02 +0200)
treeca280634f3d56cd54fb6d13323f3d9e33573d841
parente7c5dd37de0678bf6e91e54ecc573a1fc06b2dc5
parentd762f4383100c2a87b1a3f2d678cd3b5425655b4
Merge branch 'linus'
drivers/media/common/tuners/Kconfig
drivers/media/dvb/dvb-usb/Kconfig
drivers/media/video/Kconfig