summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* ARM: Orion5x - Restore parts of io.h, with reworkAndrew Lunn2012-06-231-0/+1
* Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-06-171-0/+1
|\
| * arm: versatile: fix and enable PCI I/O spaceArnd Bergmann2012-06-161-0/+1
* | ARM: dma-mapping: remove unconditional dependency on CMAMarek Szyprowski2012-06-041-1/+0
|/
* Merge branches 'fixes' and 'fixes2' into devel-lateOlof Johansson2012-05-301-1/+1
|\
| * ixp4xx: fix compilation by adding gpiolib supportRichard Cochran2012-05-231-1/+1
* | Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-261-0/+1
|\ \
| * | ARM: mxs: always build in device tree supportShawn Guo2012-05-121-0/+1
| * | Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5Shawn Guo2012-05-121-0/+1
| |\ \
* | \ \ Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-261-0/+3
|\ \ \ \
| * \ \ \ Merge branch 'clk-next' of git://git.linaro.org/people/mturquette/linux into ...Arnd Bergmann2012-05-161-0/+1
| |\ \ \ \
| | * | | | ARM: Orion: Add clocks using the generic clk infrastructure.Andrew Lunn2012-05-081-0/+1
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'spear/clock' and 'imx/clock' into next/clockArnd Bergmann2012-05-141-0/+1
| |\ \ \ \ \ \ | | | | |_|/ / | | | |/| | |
| * | | | | | Merge branch 'spear/clock' into next/clockArnd Bergmann2012-05-131-0/+1
| |\| | | | | | | |_|_|/ / | |/| | | |
| | * | | | SPEAr: Switch to common clock frameworkViresh Kumar2012-05-121-0/+1
| | | |/ / | | |/| |
| * | | | ARM: mxs: switch to common clk frameworkShawn Guo2012-05-091-0/+1
| | |_|/ | |/| |
* | | | Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-05-261-1/+0
|\ \ \ \
| * | | | Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5pKukjin Kim2012-05-131-0/+10
| |\| | |
| * | | | ARM: SAMSUNG: merge plat-s5p into plat-samsungKukjin Kim2012-05-131-1/+0
* | | | | 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
| | | |/ / / | | |/| | |