]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge 3.10-rc6 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2013 23:57:20 +0000 (16:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2013 23:57:20 +0000 (16:57 -0700)
We want these fixes here too.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
init/Kconfig

diff --cc init/Kconfig
Simple merge