summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rmobile/smp' into rmobile-latestPaul Mundt2011-01-071-1/+1
|\
| * ARM: mach-shmobile: Enable SMP supportMagnus Damm2010-12-141-1/+2
* | ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLERMagnus Damm2011-01-071-0/+1
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...Paul Mundt2011-01-071-33/+95
|\ \
| * \ Merge branch 'devel-stable' into develRussell King2011-01-061-2/+13
| |\ \
| | * \ Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev...Russell King2011-01-051-0/+10
| | |\ \
| | | * | ARM: mxs: Add build configuration for mxsShawn Guo2010-12-201-0/+10
| | * | | Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/li...Russell King2011-01-031-0/+1
| | |\ \ \
| | | * | | ux500: Add cpufreq support for u8500Martin Persson2010-12-091-0/+1
| | * | | | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King2010-12-221-5/+5
| | |\ \ \ \
| | | * | | | ARM: pxa: add iwmmx support for PJ4Haojian Zhuang2010-12-201-2/+2
| * | | | | | Merge branch 'misc' into develRussell King2011-01-061-26/+39
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'smp' into miscRussell King2011-01-061-18/+19
| | |\ \ \ \ \ \
| | | * | | | | | ARM: TWD: enable one-shot modeRussell King2011-01-021-0/+1
| | | * | | | | | ARM: 6516/1: Allow SMP_ON_UP to work with Thumb-2 kernels.Dave Martin2010-12-201-1/+1
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | ARM: DMA: add support for DMA debuggingRussell King2011-01-061-0/+1
| | * | | | | | ARM: 6532/1: Allow machine to specify it's own IRQ handlers at run-timeeric miao2010-12-241-0/+5
| | * | | | | | ARM: Ensure experimental options are so markedRussell King2010-12-051-3/+4
| | * | | | | | ARM: 6520/1: Kconfig: add new symbol MIGHT_HAVE_PCIHans Ulli Kroll2010-12-051-1/+6
| | * | | | | | ARM: 6483/1: arm & sh: factorised duplicated clkdev.cJean-Christop PLAGNIOL-VILLARD2010-11-261-21/+21
| * | | | | | | Merge branch 'clksrc' into develRussell King2011-01-051-4/+22
| |\ \ \ \ \ \ \
| | * | | | | | | ARM: vexpress: add sched_clock() for Versatile ExpressRussell King2011-01-051-0/+1
| | * | | | | | | ARM: versatile: convert sched_clock() to use new infrastructureRussell King2010-12-221-0/+2
| | * | | | | | | ARM: orion: convert sched_clock() to use new infrastructureRussell King2010-12-221-0/+1
| | * | | | | | | ARM: omap: convert sched_clock() to use new infrastructureRussell King2010-12-221-0/+1
| | * | | | | | | ARM: iop: convert sched_clock() to use new infrastructureRussell King2010-12-221-0/+1
| | * | | | | | | ARM: u300: convert sched_clock() to use new infrastructureRussell King2010-12-221-0/+1
| | * | | | | | | ARM: tegra: convert sched_clock() to use new infrastructureRussell King2010-12-221-0/+1
| | * | | | | | | ARM: sa1100: convert sched_clock() to use new infrastructureRussell King2010-12-221-0/+1
| | * | | | | | | ARM: pxa: convert sched_clock() to use new infrastructureRussell King2010-12-221-0/+1
| | * | | | | | | ARM: mmp: convert sched_clock() to use new infrastructureRussell King2010-12-221-0/+1
| | * | | | | | | ARM: ixp4xx: convert sched_clock() to use new infrastructureRussell King2010-12-221-0/+1
| | * | | | | | | ARM: sched_clock: provide common infrastructure for sched_clock()Russell King2010-12-221-0/+3
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stableRussell King2010-11-261-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | ARM: ftrace: enable function graph tracerRabin Vincent2010-11-191-0/+1
| | * | | | | | | arm: kconfig: dis-allow hotplug on MSMDaniel Walker2010-11-221-0/+1
| | * | | | | | | arm: kconfig: enable SMP for MSM targetsDaniel Walker2010-11-221-4/+5
| | | |_|/ / / / | | |/| | | | |
| | | | | | | |
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *---------. | | | | | | Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'ver...Russell King2011-01-051-1/+21
| |\ \ \ \ \ \| | | | | | | | | | | | |_|_|/ / / / | | | | | |/| | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | / / | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | | | | * | | | ARM: 6459/2: sa1100: Add nanoEngine PCI support.Marcelo Roberto Jimenez2010-12-211-1/+7
| | | | | |/ / / /
| | | | * | / / / ARM: 6487/1: add CONFIG_CRASH_DUMP to KconfigMika Westerberg2010-11-301-0/+13
| | | | | |/ / / | | | | |/| | |
| | * | / | | | ARM: 6511/1: ftrace: add ARM support for C version of recordmcountRabin Vincent2010-12-041-0/+1
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch 'rmobile/urgent' into rmobile-latestPaul Mundt2010-12-211-3/+3
|\| | | | | | | |_|_|_|_|/ |/| | | | |
| * | | | | ARM: 6534/1: Make CONFIG_FPE_NWFPE depend on !CONFIG_THUMB2_KERNELDave Martin2010-12-141-1/+1
| * | | | | ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6Dave Martin2010-12-141-1/+1
| | |/ / / | |/| | |
| * | | | ARM: 6505/1: kprobes: Don't HAVE_KPROBES when CONFIG_THUMB2_KERNEL is selectedDave Martin2010-11-301-1/+1
| |/ / /
* / / / ARM: mach-shmobile: Tidy up the Kconfig bits.Paul Mundt2010-11-161-2/+7
|/ / /
* | | Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2010-11-151-16/+16
|\ \ \ | |_|/ |/| |
| * | ARM: SAMSUNG: Fix HAVE_S3C_RTC warningsKukjin Kim2010-11-131-4/+4
| * | ARM: SAMSUNG: Fix HAVE_S3C2410_I2C warningsKukjin Kim2010-11-131-6/+6
| * | ARM: SAMSUNG: Fix HAVE_S3C2410_WATCHDOG warningsKyungmin Park2010-11-131-6/+6
| |/