summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma...Linus Torvalds2012-05-251-0/+11
|\
| * Merge branch 'for-next-arm-dma' into for-linusMarek Szyprowski2012-05-221-0/+9
| |\
| | * ARM: dma-mapping: add support for IOMMU mapperMarek Szyprowski2012-05-211-0/+8
| | * ARM: dma-mapping: use asm-generic/dma-mapping-common.hMarek Szyprowski2012-05-211-0/+1
| * | ARM: integrate CMA with DMA-mapping subsystemMarek Szyprowski2012-05-211-0/+2
| |/
* | Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-05-241-0/+1
|\ \
| * | gpiolib/arches: Centralise bolierplate asm/gpio.hMark Brown2012-05-111-0/+1
| |/
* | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-05-241-18/+2
|\ \
| * | timers: Fixup the Kconfig consolidation falloutThomas Gleixner2012-05-211-2/+0
| * | arm: Use generic time configAnna-Maria Gleixner2012-05-211-16/+2
| |/
* | Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/pa...Linus Torvalds2012-05-231-8/+0
|\ \
| * | arm: remove ability to select CONFIG_MCAPaul Gortmaker2012-05-171-8/+0
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-05-221-2/+2
|\ \
| * | Fix "the the" in various KconfigMasanari Iida2012-04-181-2/+2
* | | Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-221-1/+1
|\ \ \
| * | | ARM: mm: proc-mohawk: add suspend resume for mohawkChao Xie2012-05-071-1/+1
* | | | Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-221-0/+4
|\ \ \ \
| * | | | ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in KconfigBarry Song2012-05-151-0/+2
| * | | | ARM: nomadik: enable PINCTRL_NOMADIK where neededArnd Bergmann2012-05-151-0/+1
| * | | | ARM: mxs: enable pinctrl supportShawn Guo2012-05-121-0/+1
| | |/ / | |/| |
* | | | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-221-0/+2
|\ \ \ \
| * \ \ \ Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dtArnd Bergmann2012-05-141-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | ARM: mmp: support DT in irqHaojian Zhuang2012-05-051-0/+1
| | |/ /
| * | | Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into ne...Arnd Bergmann2012-05-091-2/+2
| |\ \ \
| * | | | ARM: LPC32xx: Device tree supportRoland Stigge2012-04-221-0/+1
| | |/ / | |/| |
* | | | Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-221-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'for-3.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...Olof Johansson2012-05-091-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRAStephen Warren2012-05-021-1/+1
| | |/ /
* | | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-221-30/+4
|\ \ \ \
| * \ \ \ Merge branch 'clps711x/cleanup' into next/cleanupArnd Bergmann2012-05-161-2/+2
| |\ \ \ \
| | * | | | ARM: clps711x: Added note about support EP731x CPU to KconfigAlexander Shiyan2012-05-141-2/+2
| | | |/ / | | |/| |
| * | | | Merge tag 'v3.4-rc6' into next/cleanupOlof Johansson2012-05-091-0/+9
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge tag 'at91-3.5-cleanup' of git://github.com/at91linux/linux-at91 into ne...Arnd Bergmann2012-04-221-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | ARM: at91: change AT91 Kconfig entry commentNicolas Ferre2012-04-161-2/+2
| | | |/ | | |/|
| * | | Merge branch 'ixp2xxx/removal' into next/cleanupOlof Johansson2012-04-141-26/+0
| |\ \ \ | | |/ / | |/| |
| | * | ARM: remove ixp23xx and ixp2000 platformsRob Herring2012-04-061-26/+0
* | | | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2012-05-211-0/+2
|\ \ \ \
| * | | | arm: Select core options instead of redefining themThomas Gleixner2012-05-211-8/+2
| |/ / /
* | | | Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-05-211-3/+1
|\ \ \ \
| * \ \ \ Merge branch 'smp/threadalloc' into smp/hotplugThomas Gleixner2012-05-081-0/+9
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | arm: Remove unused cpu_idle_wait()Thomas Gleixner2012-05-081-3/+0
| * | | | init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASKThomas Gleixner2012-05-051-1/+0
| * | | | arm: Use generic init_taskThomas Gleixner2012-05-051-0/+1
| * | | | arm: Use generic idle thread allocationThomas Gleixner2012-04-261-0/+1
| | |/ / | |/| |
* | | | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-05-211-12/+10
|\ \ \ \
| * \ \ \ Merge branch 'misc' into for-linusRussell King2012-05-211-12/+3
| |\ \ \ \
| | * | | | ARM: 7374/1: add TRACEHOOK supportWade Farnsworth2012-04-251-0/+1
| | * | | | ARM: Remove unnecessary selection of TICK_ONESHOTRussell King2012-04-251-4/+0
| | * | | | ARM: 7388/1: Kconfig: Remove duplicate IRQ Kconfig entriesStephen Boyd2012-04-191-8/+2
| | |/ / /
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' a...Russell King2012-05-211-0/+16
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | | |/ / | | | |/| |
OpenPOWER on IntegriCloud