Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 4c1d76a1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'pxa-for-4.7' of https://github.com/rjarzmik/linux into fixes

Merge "pxa changes for v4.7 cycle" from Robert Jarzmik:

This is a minor cycle with :
 - cleanup fix from Stephen on clocks (CLK_ROOT deprecated)
 - pin control activation for device-tree platforms

* tag 'pxa-for-4.7' of https://github.com/rjarzmik/linux:
  ARM: pxa: Remove CLK_IS_ROOT
  ARM: pxa: activate pinctrl for device-tree machines

These should have been part of the original pull request but got
accidentally dropped. Both changes in this branch can be considered
bugfixes, so I'm putting them in the fixes branch now.
parents 7f058c0a e4c740e2
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment