Merge 4.3-rc4 into char-misc-next

Browse source

This is needed due to the duplicated iommu stuff to help with the merge
and to prevent future issues.

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

...

This commit is contained in:

Greg Kroah-Hartman 2015-10-06 15:01:52 +01:00

parent 1e1851f9d7 049e6dde7e

commit c39b7eef7d

285 changed files with 2457 additions and 1583 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

2

include/uapi/linux/userfaultfd.h

View file