tree cfb6bc0aaab6ad7fa7ca2bb07453ed2fd139138c
parent 7e3933df9874b70745548ce9177295d11c58fc21
parent 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1454359826 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1454359826 -0800

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>