Merge 4.2-rc6 into char-misc-next

Browse source

We want the fixes in Linus's tree in here as well.

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

...

This commit is contained in:

Greg Kroah-Hartman 2015-08-09 16:28:09 -07:00

parent 4816693286 f7644cbfcd

commit 5d44f4b348

459 changed files with 6088 additions and 2695 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/drm/amdgpu_drm.h

View file

2

include/uapi/drm/radeon_drm.h

View file

1

include/uapi/linux/pci_regs.h

View file

39

include/uapi/sound/asoc.h

View file