tree 247f976882dea3bdf6d037533c94f0bf09c12f71
parent 562ed3f1f78a87746f128c313a5f92083ecb9408
parent e3b14ba3779d4e4d5d72801bbe14bb11c052aaa8
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1450477688 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1450477688 -0800

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>