Merge 3.17-rc6 into staging-next.

Browse source

We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c

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

...

This commit is contained in:

Greg Kroah-Hartman 2014-09-22 07:30:03 -07:00

parent 3f76a4ea53 0f33be009b

commit d84a2b0d6f

167 changed files with 1078 additions and 612 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

4

include/acpi/acpi_bus.h

View file

13

include/crypto/drbg.h

View file

4

include/linux/iio/trigger.h

View file

6

include/linux/pci.h

View file

2

include/linux/vga_switcheroo.h

View file

2

include/linux/vgaarb.h

View file

2

include/scsi/scsi_tcq.h

View file