mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-03 03:33:01 +09:00
This resolves the merge errors that were reported in linux-next and it picks up the staging and IIO fixes that we need/want in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>