]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit458223fbd744933a73c3bf63b7fc361af68b0f8b
treed9e6008e3bc147391634299dfb0f010591d52063
parent674c6d69b67ba320a1796a64beb9bb4272379c0b
parentc2dea2904d38f5f9f9f866476cafdab22b452972
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