Merge 3.10-rc7 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Jun 2013 22:14:43 +0000 (15:14 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Jun 2013 22:14:43 +0000 (15:14 -0700)
We want the firmware merge fixes, and other bits, in here now.

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

Simple merge
Simple merge