Merge 4.12-rc5 into staging-next

Browse source

We want the IIO fixes and other staging driver fixes in here as well.

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

...

This commit is contained in:

Greg Kroah-Hartman 2017-06-12 08:20:47 +02:00

parent e5770b7bdb 32c1431eea

commit 7bf1e44f86

864 changed files with 9807 additions and 5335 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

4

include/uapi/linux/keyctl.h

View file