Squashed update of kernel from 3.4.87 to 3.4.88
Squashed update of kernel from 3.4.88 to 3.4.89

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

Conflicts:
	drivers/infiniband/hw/ipath/ipath_diag.c
	drivers/usb/host/xhci-pci.c