Squashed update of kernel from 3.4.83 to 3.4.84
Squashed update of kernel from 3.4.84 to 3.4.85

Signed-off-by: Javelin <javelinanddart@gmail.com>

Conflicts:
	drivers/input/mouse/elantech.c
	drivers/usb/host/xhci-pci.c