Decrease wakelock timeout
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
Longterm 2.6.34.14

Signed-off-by: Humberto Borba <humberos@gmail.com>
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Conflicts:
	Makefile
	arch/x86/kernel/cpu/amd.c
	arch/x86/xen/mmu.c
	block/deadline-iosched.c
	drivers/input/xen-kbdfront.c
	drivers/staging/hv/netvsc_drv.c
	drivers/staging/usbip/usbip_common.c
	net/can/bcm.c
Revert "drivers: staging: android: backport from 3.0.x"

This reverts commit 929711aa0c39e4ba02114349ab2e056ae7f28ac0.

Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Conflicts:
	drivers/staging/android/logger.c
	drivers/staging/android/logger.h
Fix previous commit for lonterm .14
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
additional bluetooth defconfig options enabled.
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
drivers: bluetooth: updated from Aries device tree (read/copied)

Signed-off-by: Humberto Borba <humberos@gmail.com>
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Conflicts:
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
Update sio scheduler
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>
Revert "Revert "drivers: staging: android: backport from 3.0.x""

This reverts commit ae3cb0cba05f4fc2981f3b0d5c93aef8571ffd97.
Revert "Update logger"

This reverts commit 2c33716b637697d31161df19ea31b2b989c88574.
Revert "Revert "Revert "drivers: staging: android: backport from 3.0.x"""

This reverts commit 85dd78d715a8975acff0060c41b49a4c4b315815.