Linux 3.10.58

* fixed up:

USB: Add device quirk for ASUS T100 Base Station keyboard

Conflicts:
	net/l2tp/l2tp_ppp.c