diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 14:34:05 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 16:50:56 +0200 |
commit | 0dc488e778069b208d09516c5f0793dc37023c8e (patch) | |
tree | 704ad7fa4d8202f1933297e4dd348128a2b9f702 /arch/arm/mach-exynos/pm_domains.c | |
parent | c4c54da24b8ae12abb2034edaf08021894caf0d0 (diff) | |
parent | bd51de53e1be9896d815bbea30560262216d4616 (diff) |
Merge branch 'samsung/exynos-multiplatform' into next/drivers
Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos/pm_domains.c')
0 files changed, 0 insertions, 0 deletions