projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7e3933d 36f90b0)
Merge 4.5-rc2 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Feb 2016 20:50:26 +0000 (12:50 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Feb 2016 20:50:26 +0000 (12:50 -0800)
commit4cff7adbebf4d25f662b13c6582b945d9d549e25
treecfb6bc0aaab6ad7fa7ca2bb07453ed2fd139138ctree | snapshot
parent7e3933df9874b70745548ce9177295d11c58fc21commit | diff
parent36f90b0a2ddd60823fe193a85e60ff1906c2a9b3commit | diff
Merge 4.5-rc2 into staging-next

This fixes a merge issue with the panel driver, and picks up fixes in
iio and other drivers that we want here.

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