aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'android-3.0' into android-omap-3.0Todd Poynor2013-01-161-26/+37
|\
| * Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0Todd Poynor2012-11-011-26/+37
| |\
| | * ARM: 7541/1: Add ARM ERRATA 775420 workaroundSimon Horman2012-10-211-0/+10
| | * ARM: fix bad applied patch for arch/arm/Kconfig of stable 3.0.y tree.Tetsuyuki Kobayashi2012-10-021-26/+26
| | * ARM: imx: select CPU_FREQ_TABLE when neededArnd Bergmann2012-09-141-0/+1
| * | Merge linux-stable 3.0.28 into android-3.0Todd Poynor2012-04-191-1/+13
| |\ \ | | |/
| * | Merge commit 'v3.0.8' into android-3.0Colin Cross2011-10-271-0/+14
| |\ \
* | \ \ Merge linux-omap-3.0 into android-omap-3.0Todd Poynor2012-04-191-1/+13
|\ \ \ \
| * \ \ \ Merge linux-stable 3.0.28 into linux-omap-3.0Todd Poynor2012-04-191-1/+13
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | ARM: 7345/1: errata: update workaround for A9 erratum #743622Will Deacon2012-03-121-1/+1
| | * | | ARM: 7161/1: errata: no automatic store buffer drainWill Deacon2011-12-091-0/+12
| | | |/ | | |/|
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-271-0/+14
|\ \ \ \ | |/ / /
| * | | Merge commit 'v3.0.8' into linux-omap-3.0Colin Cross2011-10-271-0/+14
| |\ \ \ | | |/ /
| | * | ARM: 7091/1: errata: D-cache line maintenance operation by MVA may not succeedWill Deacon2011-10-031-0/+14
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-09-261-0/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | ARM: Enable CPU_PM notifiers on ARM machines.Santosh Shilimkar2011-09-261-0/+1
| |/
* | ARM: add option to flush console before rebootDima Zavin2011-08-231-0/+9
|/
*-. 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
| | |/ / | |/| |
* | | | ARM: bcmring: convert to sp804 clocksourceRussell King2011-05-231-0/+1
* | | | clocksource: convert MXS timrotv2 to 32-bit down counting clocksourceRussell King2011-05-231-0/+1
* | | | clocksource: convert SPEAr platforms 16-bit up counting clocksourceRussell King2011-05-231-0/+1
* | | | clocksource: convert W90x900 24-bit down counting clocksourceRussell King2011-05-231-0/+1
* | | | clocksource: convert ARM 32-bit down counting clocksourcesRussell King2011-05-231-0/+2
* | | | clocksource: convert ARM 32-bit up counting clocksourcesRussell King2011-05-231-0/+9
|/ / /
* | | Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px...Russell King2011-04-131-1/+1
|\ \ \
| * | | Fix common misspellingsLucas De Marchi2011-03-311-1/+1
| |/ /
* | | ARM: 6866/1: Do not restrict HIGHPTE to !OUTER_CACHECatalin Marinas2011-04-101-1/+0
* | | ARM: Only allow PM_SLEEP with CPUs which support suspendRussell King2011-04-021-0/+2
|/ /
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-301-0/+1
|\ \