Felipe Balbi f7cc38b16e Linux 3.17-rc4 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUDOW+AAoJEHm+PkMAQRiGOXYH/00TPKm8PdM5cXXG2YYYv9eT W99K7KD2i0/qiVtlGgjjvB7fO3K0HcZusTd2jmVd8IWntXvauq7Zpw5YZkjwu4KX Y1HCwwCd2aw0FoqgrJhNP3+j5Cr1BD/HLtbffjCe+A3tppOIis4Bwt2wJOoYlXpS hU9Jxxc4lcRo8YKbffouDo7PIneWeJy8N+WGpUR5BfJIEK0ZZtCUqn3/3WLX4FYu fE6uiF/bACTpKXU/mo4dDbhZp439H/QdwQc9B0F8+8CBDMXKaNHrPV7kN36T2SWa fD4boikTsi/yh9Ks1fvHbvNq2N0ihoMnja+vLRyvjAcAQv2fKG3OZtYgFWSdghU= =Xknd -----END PGP SIGNATURE----- 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	cgroups: fix cgroup_event_listener error handling	2013-01-08 10:00:44 -08:00
firewire	tools/firewire: nosy-dump: check for allocation failure	2012-12-02 20:10:18 +01:00
hv	Tools: hv: fix file overwriting of hv_fcopy_daemon	2014-07-09 14:21:26 -07:00
include	perf tools: Move ACCESS_ONCE from perf.h header	2014-05-05 17:49:07 +02:00
lguest	tools/lguest: offer VIRTIO_F_ANY_LAYOUT for net device.	2013-07-15 11:18:32 +09:30
lib	Linux 3.16-rc7	2014-07-28 10:00:33 +02:00
net	tools: bpf_jit_disasm: increase image buffer size	2014-05-16 16:44:08 -04:00
nfsd	NFSD: Added fault injection script	2011-11-07 21:10:47 -05:00
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	tools lib traceevent: Add global QUIET_CC_FPIC build output	2013-12-19 16:18:10 -03:00
testing	tools: selftests: fix build issue with make kselftests target	2014-08-29 16:28:17 -07:00
thermal/tmon	tmon: set umask to a reasonable value	2014-07-01 22:00:51 +08:00
time	tools: add script to test udelay	2014-07-23 10:16:38 -07:00
usb	Linux 3.17-rc4	2014-09-08 14:39:01 -05:00
virtio	tools: Consolidate types.h	2014-05-01 21:22:39 +02:00
vm	tools/vm/page-types.c: catch sigbus if raced with truncate	2014-06-04 16:53:51 -07:00
Makefile	tools/liblockdep: Build liblockdep from tools/Makefile	2014-05-08 13:34:45 -04:00