Merge commit 'v3.4.5' into android-3.4

Conflicts:
	drivers/base/power/main.c

Change-Id: I0c7d106d2de75d0e40f167245ad4cc37e1556bb0

Conflicts:
	arch/x86/kernel/cpu/scattered.c
	drivers/usb/host/xhci.h
Merge tag 'v3.4.35' into android-3.4

This is the 3.4.35 stable release

Conflicts:
	drivers/base/power/main.c
	drivers/net/tun.c
	kernel/cgroup.c
	kernel/power/suspend.c

Signed-off-by: Colin Cross <ccross@android.com>
Change-Id: I1f673ffa338439c6f6f227d67ffff24487e0cedf

Conflicts:
	arch/arm/Kconfig
	arch/arm/kernel/traps.c
	arch/arm/mm/tlb-v7.S
	arch/arm/vfp/entry.S
	arch/arm/vfp/vfpmodule.c
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/mmc/card/block.c
	drivers/usb/core/hub.c
	drivers/usb/core/message.c
	fs/buffer.c
	fs/ubifs/dir.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/mgmt.c
	net/bluetooth/rfcomm/sock.c
	net/bluetooth/smp.c
Revert "Merge tag 'v3.4.35' into android-3.4"

This reverts commit e4080ca9e6cd1f78fcb01e6c2b322e4d71cbd0ae.