Merge 3.17-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Sep 2014 03:53:12 +0000 (20:53 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Sep 2014 03:53:12 +0000 (20:53 -0700)
commite9723bf2ad1b7384e8d475e5356f51a1f35a8934
treed9e6008e3bc147391634299dfb0f010591d52063
parent79f284d29bbf7852093d0262c097e8faee32bc03
parent69e273c0b0a3c337a521d083374c918dc52c666f
Merge 3.17-rc3 into staging-next

We want the staging bugfixes in this branch as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/et131x/et131x.c
drivers/staging/lustre/lustre/obdclass/class_obd.c