Merge branch 'linus' into out-of-tree
commitb94bfbfdc4650bac3ae0cbfca32776724ebecabb
authorIngo Molnar <mingo@elte.hu>
Sat, 28 May 2011 15:51:54 +0000 (28 17:51 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 28 May 2011 15:51:54 +0000 (28 17:51 +0200)
tree4cec00b8ecdebdd7392a56d1736fce81840746c7
parent59b28833ae328e2206865fb25e61917e738d9696
parent29a6ccca3869bbe33879dae0cd7df2a1559eff54
Merge branch 'linus' into out-of-tree
drivers/media/video/Kconfig
drivers/power/Kconfig
fs/cifs/Kconfig
fs/cifs/cifs_debug.c