| commit | 30a04c1e32cad5723cb67926ce2926b85670cd4b | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sat Jun 02 01:19:38 2018 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sat Jun 02 01:19:38 2018 -0700 |
| tree | 4071477e277c069f289937faf598f743998938a7 | |
| parent | ffd831a3fc0bebacfbd0f4735345e4c350291e38 [diff] | |
| parent | c1c14f8954c6d1cb9867024618e93687d9d035ba [diff] |
Merge tag 'pxa-for-4.18' of https://github.com/rjarzmik/linux into next/soc This is is the pxa changes for v4.18 cycle : - change to phase out at24 eeprom platform data - add a missing wakeup pin on pxa320 SoCs * tag 'pxa-for-4.18' of https://github.com/rjarzmik/linux: ARM: pxa3xx: enable external wakeup pins ARM: pxa: stargate2: use device properties for at24 eeprom Signed-off-by: Olof Johansson <olof@lixom.net>