Merge branch 'linus'
commit6ab2ea6df8b18b5e65c924386a3df0499bacc2b9
authorIngo Molnar <mingo@elte.hu>
Wed, 20 Jul 2011 10:52:08 +0000 (20 12:52 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 20 Jul 2011 10:52:08 +0000 (20 12:52 +0200)
tree3dcd386d3a248b4159784a19b98e5201e0ab225b
parentc2566ee6734cf425ac1b4e459bd123a1d0ca4bd6
parente6625fa48e6580a74b7e700efd7e6463e282810b
Merge branch 'linus'
Makefile
drivers/media/radio/Kconfig
drivers/watchdog/Kconfig
include/linux/irq.h
kernel/sched.c