Merge remote-tracking branch 'linus/master' into linaro-android-3.10-experimental

Try to merge up to pre 3.10-rc1.

Lots of collisions here, so beware.

Signed-off-by: John Stultz <john.stultz@linaro.org>

Conflicts:
	Documentation/cpu-freq/governors.txt
	arch/arm/common/Makefile
	arch/arm/include/asm/irq.h
	arch/arm/kernel/process.c
	drivers/gpu/Makefile
	drivers/hid/hid-multitouch.c
	drivers/iio/industrialio-event.c
	drivers/staging/android/logger.h
	drivers/usb/otg/Kconfig
	drivers/usb/otg/Makefile
	drivers/video/Kconfig
	fs/pstore/ram.c
	include/linux/cpu.h
	include/linux/kernel.h
	init/Kconfig
	kernel/printk.c
	kernel/trace/trace.c
	kernel/trace/trace.h
	net/bluetooth/hci_event.c
	net/bluetooth/sco.c
	scripts/Makefile.lib

0 files changed, 0 insertions, 0 deletions