Squashed update of kernel from 3.4.97 to 3.4.98

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

Conflicts:
	drivers/staging/wlags49_h2/wl_priv.c
	drivers/usb/serial/option.c
	net/bluetooth/hci_conn.c