summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-261-0/+6
|\
| * ARM: Consolidate the clkdev header filesKyungmin Park2011-07-191-0/+6
* | Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/...Linus Torvalds2011-07-261-0/+26
|\ \
| * \ Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kerne...Arnd Bergmann2011-07-171-7/+19
| |\ \
| | * | ARM: Xilinx: Adding Xilinx board supportJohn Linn2011-06-201-0/+14
| | |/
| * | ARM: CSR: Adding CSR SiRFprimaII board supportBinghua Duan2011-07-091-0/+14
| |/
* | Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-07-251-11/+0
|\ \
| * | ARM: mach-loki: deleteNicolas Pitre2011-07-181-10/+0
| * | ARM: mach-s3c2400: deleteNicolas Pitre2011-07-181-1/+0
| |/
* | Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-07-251-0/+9
|\ \
| * \ Merge branch 'next-samsung-cleanup' of git://git.kernel.org/pub/scm/linux/ker...Arnd Bergmann2011-07-211-0/+8
| |\ \
| | * | clocksource: convert 32-bit down counting clocksource on S5PV210/S5P64X0Chanwoo Choi2011-07-211-0/+2
| | * | ARM: EXYNOS4: Add clkdev supportThomas Abraham2011-07-211-0/+1
| | * | ARM: S5PV210: Add clkdev supportThomas Abraham2011-07-201-0/+1
| | * | ARM: S5PC100: Add clkdev supportThomas Abraham2011-07-201-0/+1
| | * | ARM: S5P64X0: Add clkdev supportThomas Abraham2011-07-201-0/+1
| | * | ARM: S3C64XX: Add clkdev supportThomas Abraham2011-07-201-0/+1
| | * | ARM: S3C24XX: Add clkdev supportThomas Abraham2011-07-201-0/+1
| | |/
| * | Convert OMAPs 32kHz clocksource implementation to use the generic MMIORussell King - ARM Linux2011-07-101-0/+1
| |/
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cp...Linus Torvalds2011-07-241-4/+0
|\ \
| * | [CPUFREQ] Move compile for S3C64XX cpufreq to /drivers/cpufreqKukjin Kim2011-07-131-4/+0
| |/
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-07-241-10/+29
|\ \
| * \ Merge branch 'devel-stable' into for-nextRussell King2011-07-221-1/+1
| |\ \
| | * | ARM: Kconfig: Allow kprobes on Thumb-2 kernelsJon Medhurst2011-07-131-1/+1
| | |/
| * | ARM: 6960/1: allow enabling SCU code on UPRob Herring2011-07-061-1/+0
| * | ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARMSimon Horman2011-06-291-8/+25
| * | ARM: Allow SoCs to enable scatterlist chainingRussell King2011-06-021-0/+3
| |/
* | ARM / shmobile: Support for I/O power domains for SH7372 (v9)Rafael J. Wysocki2011-07-021-0/+1
|/
*-. Merge branches 'devel', 'devel-stable' and 'fixes' into for-linusRussell King2011-05-271-15/+14
|\ \
| | * ARM: 6863/1: allow hotplug on msmJeffrey Ohlstein2011-05-261-1/+0
| | * ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEMWill Deacon2011-05-261-0/+3
| |/ |/|
| * Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into deve...Russell King2011-05-261-0/+2
| |\
| | * at91: drop boot_params and PLAT_PHYS_OFFSETJean-Christophe PLAGNIOL-VILLARD2011-05-251-0/+1
| | * at91: switch to CLKDEV_LOOKUPJean-Christophe PLAGNIOL-VILLARD2011-05-251-0/+1
| |/ |/|
| * Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...Russell King2011-05-251-14/+2
| |\
| | * ARM: S5P6442: Removing ARCH_S5P6442Kukjin Kim2011-05-121-14/+2
| * | Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 in...Russell King2011-05-251-0/+7
| |\ \ |/ / /
| * | arm/dt: Allow CONFIG_OF on ARMGrant Likely2011-05-111-0/+7
| |/
* | Merge branch 'devel-stable' into for-linusRussell King2011-05-231-1/+3
|\ \
| * | ARM: Fix generic irq chipRussell King2011-05-231-0/+2
| * | ARM: Moving Marvell Dove platform defaults to ARMv7Konstantin Porotchkin2011-05-031-1/+1
| |/
| |
| \
| \
| \
| \
| \
| \
| \
*-------. \ Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and...Russell King2011-05-231-26/+32
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | | | * | ARM: 6888/1: remove ns9xxx portUwe Kleine-König2011-04-281-14/+0
| | |_|/ / | |/| | |
| | | * | ARM: 6893/1: Allow for kernel command line concatenationVictor Boivie2011-05-121-3/+18
| | | * | ARM: phys-to-virt: improve Kconfig help textsRussell King2011-05-121-4/+10
| | | * | ARM: Highmem: drop experimental statusRussell King2011-05-121-2/+2
| | | * | ARM: SMP: drop experimental statusRussell King2011-05-121-2/+1
| | |/ / | |/| |
| | * | ARM: 6900/1: Suspend: Fix build error on ARCH_S5PC100Kukjin Kim2011-05-161-1/+1
| |/ /
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generi...Russell King2011-05-231-12/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| | | * | ARM: plat-stmp: remove platWolfram Sang2011-05-021-12/+0
| | |/ / | |/| |