Felipe Balbi f7cc38b16e Merge tag 'v3.17-rc4' into next ...

Merge Linux 3.17-rc4 here so we have all the latest
fixes on next too. This also cleans up a few conflicts
when applying patches.

Signed-off-by: Felipe Balbi <balbi@ti.com>

Conflicts:
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/function/Makefile
	drivers/usb/gadget/legacy/Makefile
	drivers/usb/phy/phy-samsung-usb.h

2014-09-08 14:39:01 -05:00

..

cgroup

…

firewire

…

hv

Tools: hv: fix file overwriting of hv_fcopy_daemon

2014-07-09 14:21:26 -07:00

include

…

lguest

…

lib

Merge tag 'v3.16-rc7' into perf/core, to merge in the latest fixes before applying new changes

2014-07-28 10:00:33 +02:00

net

…

nfsd

…

perf

Revert "perf tools: Fix jump label always changing during tracing"

2014-07-28 16:39:18 +02:00

power

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2014-08-16 09:25:34 -06:00

scripts

…

testing

tools: selftests: fix build issue with make kselftests target

2014-08-29 16:28:17 -07:00

thermal/tmon

…

time

tools: add script to test udelay

2014-07-23 10:16:38 -07:00

usb

Merge tag 'v3.17-rc4' into next

2014-09-08 14:39:01 -05:00

virtio

…

vm

…

Makefile

…