Merge 4.10-rc4 into usb-next

Browse source

We need the USB fixes in here to make merges easier/possible with the
other sub-maintainer USB trees.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2017-01-16 11:57:53 +01:00

parent 1129d270cb 49def18533

commit a47b66da03

313 changed files with 3006 additions and 1758 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

tools/lib/subcmd/parse-options.c

View file

5

tools/lib/subcmd/parse-options.h

View file

4

tools/lib/traceevent/plugin_sched_switch.c

View file

4

tools/perf/Documentation/perf-record.txt

View file

4

tools/perf/Makefile.perf

View file

1

tools/perf/builtin-kmem.c

View file

4

tools/perf/builtin-record.c

View file

17

tools/perf/builtin-sched.c

View file

105

tools/perf/util/probe-event.c

View file

6

tools/perf/util/symbol-elf.c

View file

2

tools/testing/selftests/Makefile

View file

2

tools/testing/selftests/bpf/test_kmod.sh

View file

2

tools/testing/selftests/net/run_netsocktests

View file

2

tools/testing/selftests/x86/protection_keys.c

View file