mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00: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>