diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-20 20:22:44 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-20 20:22:44 +0200 |
| commit | 4c1d76a1e15e0d66e581764b4d29d08d207aff4a (patch) | |
| tree | 93e6398be3a8cb3da241f0bd3e9b61023e290f04 /arch/arm/mach-pxa/tosa.c | |
| parent | 7f058c0a4a0441044f96fcc863533004bc82cf65 (diff) | |
| parent | e4c740e23969470f779a4c67861be4f09f87d8a0 (diff) | |
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.
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
0 files changed, 0 insertions, 0 deletions