| author | Dan Murphy <DMurphy@ti.com> | |
| Fri, 24 Oct 2014 14:59:05 +0000 (09:59 -0500) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Fri, 24 Oct 2014 14:59:05 +0000 (09:59 -0500) | ||
| commit | ba9a9f637a5ae49fa32c628e74212974ac7469a4 | |
| tree | 5b2463846bab778966008d2374021fd8d09c1c58 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 73fceef332e16b4a85fb08850120b70b6a594285 | commit | diff |
| parent | d7892a4c389d54bccb9bce8e65eb053a33bbe290 | commit | diff |
Merge tag 'v3.14.22' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.14.y
This is the 3.14.22 stable release
* tag 'v3.14.22' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (315 commits)
Linux 3.14.22
serial: 8250: Add Quark X1000 to 8250_pci.c
crypto: caam - fix addressing of struct member
usb: musb: dsps: kill OTG timer on suspend
USB: cp210x: add support for Seluxit USB dongle
USB: serial: cp210x: added Ketra N1 wireless interface support
USB: Add device quirk for ASUS T100 Base Station keyboard
tcp: fixing TLP's FIN recovery
sctp: handle association restarts when the socket is closed.
team: avoid race condition in scheduling delayed work
ip6_gre: fix flowi6_proto value in xmit path
hyperv: Fix a bug in netvsc_start_xmit()
gro: fix aggregation for skb using frag_list
Revert "net/macb: add pinctrl consumer support"
macvtap: Fix race between device delete and open.
xfrm: Generate queueing routes only from route lookup functions
xfrm: Generate blackhole routes only from route lookup functions
tg3: Allow for recieve of full-size 8021AD frames
tg3: Work around HW/FW limitations with vlan encapsulated frames
net: allow macvlans to move to net namespace
...
Conflicts:
arch/arm/boot/dts/dra7-evm.dts
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
arch/arm/mach-omap2/soc.h
drivers/usb/dwc3/core.c
drivers/usb/musb/musb_dsps.c
Signed-off-by: Dan Murphy <DMurphy@ti.com>
This is the 3.14.22 stable release
* tag 'v3.14.22' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (315 commits)
Linux 3.14.22
serial: 8250: Add Quark X1000 to 8250_pci.c
crypto: caam - fix addressing of struct member
usb: musb: dsps: kill OTG timer on suspend
USB: cp210x: add support for Seluxit USB dongle
USB: serial: cp210x: added Ketra N1 wireless interface support
USB: Add device quirk for ASUS T100 Base Station keyboard
tcp: fixing TLP's FIN recovery
sctp: handle association restarts when the socket is closed.
team: avoid race condition in scheduling delayed work
ip6_gre: fix flowi6_proto value in xmit path
hyperv: Fix a bug in netvsc_start_xmit()
gro: fix aggregation for skb using frag_list
Revert "net/macb: add pinctrl consumer support"
macvtap: Fix race between device delete and open.
xfrm: Generate queueing routes only from route lookup functions
xfrm: Generate blackhole routes only from route lookup functions
tg3: Allow for recieve of full-size 8021AD frames
tg3: Work around HW/FW limitations with vlan encapsulated frames
net: allow macvlans to move to net namespace
...
Conflicts:
arch/arm/boot/dts/dra7-evm.dts
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
arch/arm/mach-omap2/soc.h
drivers/usb/dwc3/core.c
drivers/usb/musb/musb_dsps.c
Signed-off-by: Dan Murphy <DMurphy@ti.com>
16 files changed: