aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-171-2/+2
|\
| * Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...Russell King2011-03-151-1/+1
| |\
| | * ARM: EXYNOS4: Update Kconfig and Makefile for the new ARCH_EXYNOS4Kukjin Kim2011-02-221-1/+1
| * | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev...Russell King2011-03-101-1/+1
| |\ \ | | |/ | |/|
| | * ARM: imx3x: clean up ARCH_MX3XRichard Zhao2011-03-071-1/+1
* | | Merge branch 'v6v7' into develRussell King2011-03-161-21/+29
|\ \ \
| * | | ARM: v6k: DMA_CACHE_RWFO isn't appropriate for non-v6k CPUsRussell King2011-02-021-1/+1
| * | | ARM: v6k: allow swp emulation again when ARMv7 is enabledRussell King2011-02-021-1/+1
| * | | ARM: v6k: do not disable CPU_32v6K based on platform selectionRussell King2011-02-021-11/+3
| * | | ARM: v6k: use CPU domain feature if we include support for arch < ARMv6KRussell King2011-02-021-2/+5
| * | | ARM: v6k: Dove platforms use V6K architecture CPUsRussell King2011-02-021-2/+2
| * | | ARM: v6k: introduce CPU_V6K optionRussell King2011-02-021-17/+30
| | |/ | |/|
* | | Merge branch 'misc' into develRussell King2011-03-161-0/+5
|\ \ \ | |_|/ |/| |
| * | ARM: move L1_CACHE_SHIFT_6 to mm/KconfigRussell King2011-02-231-0/+5
| |/
* | ARM: make SWP emulation explicit on !CPU_USE_DOMAINSRussell King2011-02-101-1/+1
* | ARM: Avoid building unsafe kernels on OMAP2 and MX3Russell King2011-02-091-2/+2
|/
* Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-01-141-1/+1
|\
| * ARM: Do not enable SWP emulation if CPU_V6 && CPU_V7Catalin Marinas2011-01-061-1/+1
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...Paul Mundt2011-01-071-1/+42
|\ \ | |/
| * Merge branch 'devel-stable' into develRussell King2011-01-061-1/+7
| |\
| | * ARM: mmp: select CPU_PJ4Haojian Zhuang2010-12-181-1/+1
| | * ARM: pxa: support pxa95xHaojian Zhuang2010-12-181-0/+6
| * | ARM: 6396/1: Add SWP/SWPB emulation for ARMv7 processorsLeif Lindholm2010-11-041-0/+27
| * | ARM: 6384/1: Remove the domain switching on ARMv6k/v7 CPUsCatalin Marinas2010-11-041-0/+8
| |/
* | ARM: mach-shmobile: Initial AG5 and AG5EVM supportMagnus Damm2010-11-181-1/+1
|/
* ARM: Improve the L2 cache performance when PL310 is usedCatalin Marinas2010-10-261-0/+8
* ARM: 6344/1: Mark CPU_32v6K as depended on CPU_V7Catalin Marinas2010-09-021-1/+1
* Merge branches 'master' and 'devel' into for-linusRussell King2010-08-101-2/+2
|\
| * Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...Russell King2010-08-091-1/+2
| |\
| | * ARM: S5PV310: Add new Kconfig and MakefilesChanghwan Youn2010-08-051-1/+2
* | | [ARM] tegra: initial tegra supportErik Gilling2010-08-051-1/+2
|/ /
| |
| \
*-. \ Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl...Russell King2010-07-311-11/+0
|\ \ \ | |_|/ |/| |
| | * ARM: 6207/1: Replace CONFIG_HAS_TLS_REG with HWCAP_TLS and check for it on V6Tony Lindgren2010-07-091-11/+0
| |/
* | ARM: 6202/1: Do not ARM_DMA_MEM_BUFFERABLE on RealView boards with L210/L220Catalin Marinas2010-07-021-0/+2
* | ARM: 6188/1: Add a config option for the ARM11MPCore DMA cache maintenance wo...Catalin Marinas2010-07-011-0/+19
|/
* Merge branch 'devel-stable' into develRussell King2010-05-171-1/+16
|\
| * Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King2010-05-131-1/+1
| |\
| | * [ARM] mmp: enable L2 in mmp2Haojian Zhuang2010-05-111-1/+1
| * | arm: mm: qsd8x50: Fix incorrect permission faultsDave Estes2010-05-031-0/+2
| |/
| * ARM: 5996/1: ARM: Change the mandatory barriers implementation (4/4)Catalin Marinas2010-03-251-0/+6
| * ARM: 5995/1: ARM: Add L2x0 outer_sync() support (3/4)Catalin Marinas2010-03-251-0/+1
| * ARM: 5994/1: ARM: Add outer_cache_fns.sync function pointer (2/4)Catalin Marinas2010-03-251-0/+6
| |
| \
| \
| \
*---. \ Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap',...Russell King2010-05-171-1/+21
|\ \ \ \ | |_|_|/ |/| | |
| | | * ARM: Add Versatile Express CA9x4 processor supportRussell King2010-05-021-1/+2
| |_|/ |/| |
| | * ARM: 6027/1: ux500: enable l2x0 supportSrinidhi Kasagar2010-04-141-1/+2
| |/ |/|
| * ARM: Optionally allow ARMv6 to use 'normal, bufferable' memory for DMARussell King2010-05-171-0/+19
|/
* ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kc...Kukjin Kim2010-02-241-1/+1
* ARM: 5917/1: OMAP4: Add L2 Cache supportSantosh Shilimkar2010-02-151-1/+1
* ARM: 5911/1: ARM: Select CPU_32v6K for CPU_V7 only if ARCH_OMAP2 is not selectedTony Lindgren2010-02-151-2/+2
* ARM: Kill CONFIG_CPU_32Russell King2009-12-181-4/+0