Merge branch 'linus'
commit23b093d47b6905dcf8b45b1c11e4cd5e45f19444
authorIngo Molnar <mingo@elte.hu>
Mon, 1 Aug 2011 14:59:34 +0000 (1 16:59 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 1 Aug 2011 14:59:34 +0000 (1 16:59 +0200)
tree25421d956ad8fb788ecdc544e3f48bb46a34bdd4
parente55bb1afacc851420bf3cf81d123bf58419ab68b
parent3da3f872aa175f59e20766ed30aaea67fd4fa7d1
Merge branch 'linus'
drivers/media/common/tuners/Kconfig
drivers/media/dvb/dvb-usb/Kconfig
drivers/media/video/Kconfig
drivers/power/Kconfig
drivers/watchdog/Kconfig
include/linux/irq.h