diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 18:43:40 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 18:43:40 +0200 |
| commit | e1ddcdef841f68d175b1a4a5c91d55f383ce5241 (patch) | |
| tree | 69122e47ea903b99c5e7a6c871deb7717663bf5f /arch/arm/mach-omap2/clock36xx.h | |
| parent | Merge tag 'renesas-r8a7779-multiplatform2-for-v3.17' of git://git.kernel.org/... (diff) | |
| parent | ARM: shmobile: Move sh7372.h (diff) | |
| download | linux-e1ddcdef841f68d175b1a4a5c91d55f383ce5241.tar.xz linux-e1ddcdef841f68d175b1a4a5c91d55f383ce5241.zip | |
Merge branch 'renesas/cleanup2' into next/soc
Merging in as base to resolve a merge conflict with later soc branch
locally.
Diffstat (limited to 'arch/arm/mach-omap2/clock36xx.h')
0 files changed, 0 insertions, 0 deletions