Merge 4.0-rc7 into tty-next

Browse source

We want the fixes in here as well, also to help out with merge issues.

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

...

This commit is contained in:

Greg Kroah-Hartman 2015-04-07 11:07:20 +02:00

parent fbf4763531 f22e6e8471

commit b3e3bf2ef2

305 changed files with 2832 additions and 1381 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

include/uapi/linux/input.h

View file

2

include/uapi/linux/nfsd/export.h

View file