]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 027ae26 ae202af)
Merge branch 'depends/rmk/memory_h' into next/cleanup2
authorArnd Bergmann <arnd@arndb.de>
Tue, 1 Nov 2011 12:47:27 +0000 (13:47 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 1 Nov 2011 12:47:27 +0000 (13:47 +0100)
commit0db43ed4381b9ac278baf5d8fbaf024928ec30fa
treee7c2080df1a5851e0c5353c48a211d9af91aae68tree | snapshot
parent027ae268852ee080bda98cce968503b9f66605b2commit | diff
parentae202afecd8c2eadc83f62446af441dfc4355b10commit | diff
Merge branch 'depends/rmk/memory_h' into next/cleanup2

Theis resolves lots of simple conflicts between the omap
cleanup and the mach/memory.h removal series.

Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/io.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/io.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
63 files changed:
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/kernel/setup.c diff1 | diff2 | blob | history
arch/arm/mach-davinci/board-da850-evm.c diff1 | diff2 | blob | history
arch/arm/mach-davinci/sleep.S diff1 | diff2 | blob | history
arch/arm/mach-exynos4/mach-universal_c210.c diff1 | diff2 | blob | history
arch/arm/mach-imx/mach-cpuimx27.c diff1 | diff2 | blob | history
arch/arm/mach-imx/mach-cpuimx35.c diff1 | diff2 | blob | history
arch/arm/mach-imx/mach-eukrea_cpuimx25.c diff1 | diff2 | blob | history
arch/arm/mach-integrator/integrator_ap.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-ams-delta.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-fsample.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-generic.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-h2.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-h3.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-htcherald.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-innovator.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-nokia770.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-osk.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-palmte.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-palmtt.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-palmz71.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-perseus2.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-sx1.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/board-voiceblue.c diff1 | diff2 | blob | history
arch/arm/mach-omap1/io.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-2430sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-3430sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-3630sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-4430sdp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-am3517crane.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-am3517evm.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-apollon.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-cm-t35.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-cm-t3517.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-devkit8000.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-generic.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-h4.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-igep0020.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-ldp.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-n8x0.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3beagle.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3evm.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3logic.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3pandora.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3stalker.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3touchbook.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap4panda.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-overo.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-rm680.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-rx51.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-ti8168evm.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-zoom.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/io.c diff1 | diff2 | blob | history
arch/arm/mach-orion5x/dns323-setup.c diff1 | diff2 | blob | history
arch/arm/mach-s3c64xx/mach-smdk6410.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-ag5evm.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-ap4evb.c diff1 | diff2 | blob | history
arch/arm/mach-shmobile/board-mackerel.c diff1 | diff2 | blob | history
arch/arm/mach-vexpress/v2m.c diff1 | diff2 | blob | history
arch/arm/mm/dma-mapping.c diff1 | diff2 | blob | history
arch/arm/mm/init.c diff1 | diff2 | blob | history
arch/arm/plat-omap/include/plat/io.h diff1 | diff2 | blob | history
arch/arm/plat-omap/io.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.