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)
commitb5aef682e00c424bb2f55639168083b61803a012
treeb7b69146e8331f96db02b766fc139d8a0907d446
parent90f8908127b55aa22f5a995880d5ac8cd23fbe1e
parent9e895ace5d82df8929b16f58e9f515f6d54ab82d
Merge 3.10-rc7 into driver-core-next

We want the firmware merge fixes, and other bits, in here now.

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