projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 562ed3f e3b14ba)
staging: wilc1000: Merge wilc-branch-arnd into work-testing
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Dec 2015 22:28:08 +0000 (14:28 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Dec 2015 22:28:08 +0000 (14:28 -0800)
commite17bc4c4f15ca547ac4de9fb450f68419f8f0ce1
tree247f976882dea3bdf6d037533c94f0bf09c12f71tree | snapshot (tar.gz zip)
parent562ed3f1f78a87746f128c313a5f92083ecb9408commit | diff
parente3b14ba3779d4e4d5d72801bbe14bb11c052aaa8commit | diff
staging: wilc1000: Merge wilc-branch-arnd into work-testing

This was done to handle two large patch sets that conflicted to be
merged together without forcing each developer to redo their work.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c diff1 | diff2 | blob | history