Merge 4.1-rc7 into tty-next

Browse source

This fixes up a merge issue with the amba-pl011.c driver, and we want
the fixes in this branch as well.

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

...

This commit is contained in:

Greg Kroah-Hartman 2015-06-08 10:49:28 -07:00

parent 1c4b1d73ba d4a4f75cd8

commit 00fda1682e

501 changed files with 4479 additions and 2389 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/netfilter/nf_conntrack_tcp.h

View file

2

include/uapi/linux/rtnetlink.h

View file

1

include/uapi/linux/virtio_balloon.h

View file