mirror of
https://github.com/torvalds/linux.git
synced 2026-04-30 12:32:31 -04:00
The merge is clean, but the arm build fails afterwards, due to API changes in the regulator tree. I've included the patch into the merge to fix the build. Signed-off-by: Dave Airlie <airlied@redhat.com>