summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-20 17:35:16 +0200
committerArnd Bergmann <arnd@arndb.de>2013-06-20 17:35:16 +0200
commitaee9a50c5b9e424994a58b2aefaa499623e6786a (patch)
treebb4b4b1664fa45d4823778efa57bf677b378837c /arch/arm/mach-mxs
parent58eb042889ddc8035ddb68a9c9cbd2251d1b7feb (diff)
parent8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54 (diff)
downloadblackbird-op-linux-aee9a50c5b9e424994a58b2aefaa499623e6786a.tar.gz
blackbird-op-linux-aee9a50c5b9e424994a58b2aefaa499623e6786a.zip
Merge branch 'omap/pm-voltdomain-cleanup' into next/soc
Conflicts: arch/arm/mach-omap2/Makefile arch/arm/mach-omap2/io.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mxs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud