summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branches 'master' and 'devel' into for-linusRussell King2010-08-101-0/+1
|\
| * Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...Russell King2010-08-091-0/+1
| |\
| | * ARM: S5PV310: Add new Kconfig and MakefilesChanghwan Youn2010-08-051-0/+1
* | | [ARM] tegra: initial tegra supportErik Gilling2010-08-051-0/+1
|/ /
* | Merge branch 'devel-stable' into develRussell King2010-07-311-2/+7
|\ \
| * \ Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev...Russell King2010-07-291-2/+2
| |\ \
| | * | ARM: imx: move mx1 support to mach-imxUwe Kleine-König2010-06-301-1/+1
| | * | ARM: imx: rename mach dir for mx21 and mx27 to mach-imxUwe Kleine-König2010-06-241-1/+1
| | |/
| * | Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc ...Russell King2010-07-291-0/+1
| |\ \
| | * | ARM: Add support for the LPC32XX archKevin Wells2010-07-271-0/+1
| | |/
| * | ARM: initial stack protector (-fstack-protector) supportNicolas Pitre2010-06-141-0/+4
| |/
* | ARM: Remove support for LinkUp Systems L7200 SDP.Russell King2010-06-241-1/+0
|/
* Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into dev...Russell King2010-05-241-2/+1
|\
| * ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p frameworkMarek Szyprowski2010-05-201-2/+1
* | Merge branch 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linuxLinus Torvalds2010-05-191-0/+2
|\ \ | |/
| * ARM: Merge for-2635/fb-updates1Ben Dooks2010-05-191-1/+1
| |\
| * | ARM: S3C24XX: Locate kernel at 0x30108000 if PM_H1940 is enabledVasily Khoruzhick2010-05-121-0/+2
* | | Merge branch 'devel-stable' into develRussell King2010-05-171-1/+2
|\ \ \
| * \ \ Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-s...Russell King2010-05-171-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | ARM: S3C2416: Add arch supportYauhen Kharuzhy2010-05-101-1/+1
| | |/
| * | ARM: cns3xxx: Add basic support for Cavium Networks CNS3xxx processorsAnton Vorontsov2010-05-021-0/+1
| |/
| |
| \
*-. \ Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap',...Russell King2010-05-171-0/+7
|\ \ \ | |_|/ |/| |
| | * ARM: Add Versatile Express supportRussell King2010-05-021-0/+1
| | * ARM: Realview/Versatile/Integrator: separate out common clock codeRussell King2010-05-021-0/+1
| |/ |/|
| * ARM: 6016/1: ST SPEAr: Added support for SPEAr platform and machines in arch/...viresh kumar2010-04-141-0/+5
|/
* Merge branch 'origin' into devel-stableRussell King2010-03-081-0/+1
|\
| * Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-03-011-0/+1
| |\
| | * Merge branch 'tmpreg' into develRussell King2010-02-251-2/+2
| | |\
| | * | ARM: 5859/1: Add nuc93x platform supportwanzongshun2010-01-271-0/+1
* | | | Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into dev...Russell King2010-03-021-6/+8
|\ \ \ \
| * | | | ARM: S5PV210: Update Kconfig and MakefilesKukjin Kim2010-02-241-0/+1
| * | | | ARM: S5P6442: Update Kconfig and MakefilesKukjin Kim2010-02-241-0/+1
| * | | | ARM: SAMSUNG: Eliminate plat-s3cBen Dooks2010-02-241-4/+4
| * | | | ARM: Merge next-samsung-s3c64xx-platdeletionBen Dooks2010-02-221-2/+2
| |\ \ \ \
| | * | | | ARM: S3C64XX: Eliminate plat-s3c64xxBen Dooks2010-02-221-1/+1
| | * | | | ARM: S3C64XX: Remove plat-s3c64xx Kconfig and PLAT_S3C64XXBen Dooks2010-02-201-1/+1
| | * | | | ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410Ben Dooks2010-01-261-1/+1
| * | | | | ARM: S3C24XX: Remove old mach-s3c2442Ben Dooks2010-02-011-1/+1
| |/ / / /
* | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev...Russell King2010-03-021-0/+1
|\ \ \ \ \
| * | | | | ARM: mach-shmobile: SH-Mobile G3 support.Magnus Damm2010-02-081-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev...Russell King2010-03-021-0/+1
|\ \ \ \ \
| * | | | | mxc: Add support for the Babbage board (i.MX5)Amit Kucheria2010-02-091-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stableRussell King2010-02-151-3/+3
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | ARM: 5904/1: ARM: Always generate the IT instruction when compiling for Thumb-2Catalin Marinas2010-01-301-1/+1
| | |/ | |/|
| * | ARM: fix badly placed mach/plat entries in Kconfig & MakefileRussell King2010-01-171-2/+2
| |/
* | ARM: S5P6440: Add new Kconfig and MakefilesKukjin Kim2010-01-151-0/+2
|/
* arm: move mach-types to include/generatedSam Ravnborg2009-12-121-12/+2
* Merge branch 'devel-stable' into develRussell King2009-12-051-3/+4
|\
| * Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stableRussell King2009-12-041-3/+3
| |\
| | * ARM: SAMSUNG: Add plat-samsung as starting point for plat-s3c* movesBen Dooks2009-12-011-3/+3
OpenPOWER on IntegriCloud