diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:59:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:59:54 +0100 |
| commit | cff9f37a1e7b2565f254b5ab40c3213cc0f823a1 (patch) | |
| tree | 4ce5bef1e68a7cdd0567a6ab7c755fdbd9365d7b /drivers/pci/pcie/aer/aerdrv_core.c | |
| parent | b599dc078a7fd423c97217756d09400403a90a7f (diff) | |
| parent | cc4b1e24b93dd529b1d49258bee044d319b5b129 (diff) | |
Merge branch 'omap/cleanup-prcm-part2' into next/dt
This resolves a nontrivial conflict where the omap_prcm_restart
is removed in one branch but another use is added in another
branch.
Conflicts:
arch/arm/mach-omap2/cm33xx.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/prm_common.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/pci/pcie/aer/aerdrv_core.c')
0 files changed, 0 insertions, 0 deletions