Merge 3.12-rc6 into driver-core-next

We want these fixes here too.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc arch/powerpc/kernel/vio.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc kernel/events/core.c
Simple merge