Merge 4.0-rc3 into tty-testing

Browse source

This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

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

...

This commit is contained in:

Greg Kroah-Hartman 2015-03-09 07:08:37 +01:00

parent 9eccca0843 3372ec2862

commit becba85f0e

40 changed files with 1422 additions and 2132 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

19

include/uapi/linux/serial_reg.h

View file