projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e79061 bc465aa)
Merge 4.0-rc5 into staging-testing
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Mar 2015 20:36:48 +0000 (21:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Mar 2015 20:36:48 +0000 (21:36 +0100)
commit807dc0668e7af56a49cf360c2d12f9b04083ac47
treeadaa1c3ec5d7c39b5ebe62e45825c029e179cecftree | snapshot
parent5e790610bc19887387d5914cf8ed58434c5bde08commit | diff
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6commit | diff
Merge 4.0-rc5 into staging-testing

We want the staging tree fixes that are upstream here as well to prevent
merge conflicts from people trying to clean up code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS diff1 | diff2 | blob | history
drivers/staging/vt6655/device_main.c diff1 | diff2 | blob | history
John Crispins staging tree