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

Conflicts:
	net/8021q/vlan_dev.c