summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xxKukjin Kim2012-03-071-1/+1
|\
| * ARM: S3C2443: move mach-s3c2443/* into mach-s3c24xx/Kukjin Kim2012-03-031-1/+1
| * ARM: S3C2416: move mach-s3c2416/* into mach-s3c24xx/Kukjin Kim2012-03-031-1/+1
| * ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/Kukjin Kim2012-03-031-1/+1
| * ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XXKukjin Kim2012-03-031-1/+1
* | Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-01-231-1/+0
|\ \ | |/ |/|
| * ARM i.MX: Merge i.MX5 support into mach-imxSascha Hauer2011-11-161-1/+0
* | arm: Remove TCC subarch from Kconfig/MakefileHans J. Koch2012-01-051-2/+0
|/
* ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynosKukjin Kim2011-11-061-1/+1
* Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-1/+3
|\
| * Merge branch 'imx/imx6q' into next/socArnd Bergmann2011-11-021-1/+1
| |\
| | * arm/imx: merge i.MX3 and i.MX6Sascha Hauer2011-10-311-2/+1
| | * arm/imx6q: add core definitions and low-level debug uartShawn Guo2011-10-311-0/+1
| | * Merge branch 'imx/devel' into imx/imx6qArnd Bergmann2011-10-311-3/+1
| | |\
| * | \ Merge branch 'picoxcell/soc' into next/socArnd Bergmann2011-11-021-0/+1
| |\ \ \
| | * | | picoxcell: support for Picochip picoxcell devicesJamie Iles2011-09-261-0/+1
| * | | | Merge branch 'highbank/soc' into next/socArnd Bergmann2011-11-021-0/+1
| |\ \ \ \
| | * | | | ARM: add Highbank core platform supportRob Herring2011-10-311-0/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'imx/devel' into next/dtArnd Bergmann2011-11-011-3/+1
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
* | | | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCsSascha Hauer2011-08-241-3/+1
| | |/ | |/|
* | | Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-011-1/+0
|\ \ \ | |_|/ |/| |
| * | ARM: mach-nuc93x: deleteNicolas Pitre2011-09-221-1/+0
| |/
* | ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMsStephen Boyd2011-08-131-0/+3
|/
* Merge branch 'imx/dt' into next/dtArnd Bergmann2011-07-281-3/+4
|\
| * Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/...Linus Torvalds2011-07-261-0/+3
| |\
| | * Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kerne...Arnd Bergmann2011-07-171-0/+2
| | |\
| | | * ARM: Xilinx: Adding Xilinx board supportJohn Linn2011-06-201-0/+2
| | * | ARM: CSR: Adding CSR SiRFprimaII board supportBinghua Duan2011-07-091-0/+1
| | |/
| * | ARM: mach-loki: deleteNicolas Pitre2011-07-181-1/+0
| * | ARM: mach-s3c2400: deleteNicolas Pitre2011-07-181-1/+1
| * | ARM: mach-s3c24a0: deleteNicolas Pitre2011-07-181-1/+0
| |/
* | arm/dt: Add dtb make ruleRob Herring2011-07-251-0/+7
|/
* Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...Russell King2011-05-251-1/+0
|\
| * ARM: S5P6442: Removing ARCH_S5P6442Kukjin Kim2011-05-121-1/+0
* | Merge branch 'devel-stable' into for-linusRussell King2011-05-231-2/+1
|\ \
| * | ARM: imx: move mx3 support to mach-imxUwe Kleine-König2011-05-191-1/+1
| * | ARM: remove support for mxc91231Uwe Kleine-König2011-05-191-1/+0
| |/
| |
| \
*-. \ Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and...Russell King2011-05-231-1/+0
|\ \ \ | | |/ | |/|
| | * ARM: 6888/1: remove ns9xxx portUwe Kleine-König2011-04-281-1/+0
| |/
* | ARM: plat-stmp: remove platWolfram Sang2011-05-021-1/+0
* | ARM: mach-stmp378x: remove machWolfram Sang2011-05-021-1/+0
* | ARM: mach-stmp37xx: remove machWolfram Sang2011-05-021-1/+0
|/
* Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-171-1/+1
|\
| * ARM: EXYNOS4: Update Kconfig and Makefile for the new ARCH_EXYNOS4Kukjin Kim2011-02-221-1/+1
* | Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-161-2/+0
|\ \
| * | ARM: 6629/2: aaec2000: remove support for mach-aaec2000Jamie Iles2011-02-111-1/+0
| * | ARM: lh7a40x: remove unmaintained platform supportRussell King2011-01-241-1/+0
* | | Merge branch 'v6v7' into develRussell King2011-03-161-0/+1
|\ \ \
| * | | ARM: v6k: introduce CPU_V6K optionRussell King2011-02-021-0/+1
| |/ /
OpenPOWER on IntegriCloud