summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-2215-146/+104
|\
| * Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/bo...Olof Johansson2012-05-1812-45/+39
| |\
| | * ARM: pxa: hx4700: Add Synaptics NavPoint touchpadPaul Parsons2012-05-142-1/+24
| | * ARM: pxa: Use REGULATOR_SUPPLY macroAxel Lin2012-05-1411-44/+15
| * | Merge tag 'omap-board-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/...Olof Johansson2012-05-103-3/+31
| |\ \ | | |/
| * | ARM: pxa: Add standard UART to hx4700_pin_config[]Paul Parsons2012-05-051-0/+4
| * | ARM: pxa: hx4700: Add PCMCIA/CF supportPaul Parsons2012-05-031-1/+1
| * | ARM: pxa: hx4700: Enable ASIC3 GPIO as a wakeup sourcePaul Parsons2012-05-031-1/+2
| * | ARM: pxa: hx4700: Initialize DS1WM clock_ratePaul Parsons2012-05-031-0/+1
| * | ARM: pxa: mioa701 add camera output enable gpioRobert Jarzmik2012-04-272-0/+5
| * | ARM: pxa: use ioremap to access CPLDSascha Hauer2012-04-272-99/+52
| | |
| \ \
*-. \ \ Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' a...Russell King2012-05-214-5/+32
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| | * ARM: PCI: provide a default bus scan implementationRussell King2012-05-131-1/+1
| | * ARM: PCI: get rid of pci_std_swizzle()Russell King2012-05-131-1/+0
| |/ |/|
| * ARM: PXA2xx: MFP: fix potential direction bugIgor Grinberg2012-04-271-0/+9
| * ARM: PXA2xx: MFP: fix bug with MFP_LPM_KEEP_OUTPUTIgor Grinberg2012-04-272-2/+17
| * ARM: pxa: fix gpio wakeup settingRobert Jarzmik2012-04-271-1/+5
|/
* ARM: fix __io macro for PCMCIARob Herring2012-04-052-0/+18
* Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-03-301-0/+2
|\
| * ARM: fix builds due to missing <asm/system_misc.h> includesOlof Johansson2012-03-301-0/+2
* | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-03-295-11/+6
|\ \ | |/
| * Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixesOlof Johansson2012-03-295-11/+6
| |\
| | * ARM: pxa: fix build issue on stargate2Haojian Zhuang2012-03-301-1/+1
| | * ARM: pxa: fix build issue on cm-x300Haojian Zhuang2012-03-301-1/+0
| | * ARM: pxa: fix build failure for regulator consumer in em-x270.cPaul Gortmaker2012-03-301-5/+5
| | * ARM: pxa: fix regulator related build fail in magician_defconfigPaul Gortmaker2012-03-282-4/+0
* | | Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-03-2911-26/+9
|\ \ \
| * | | ARM: pxa: use common IOMEM definitionRob Herring2012-03-259-2/+8
| * | | ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbolRob Herring2012-03-252-4/+1
| * | | ARM: remove bunch of now unused mach/io.h filesRob Herring2012-03-061-20/+0
* | | | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-2937-1/+48
|\ \ \ \ | |_|/ / |/| | |
| * | | ARM: 7344/1: pxa: mainstone: add missing include for IRQ_BOARD_STARTRob Herring2012-02-231-0/+2
| * | | Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into deve...Russell King2012-02-0436-1/+46
| |\ \ \
| | * | | ARM: pxa: remove NR_IRQSRob Herring2012-01-2536-1/+46
* | | | | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-2812-6/+6
|\ \ \ \ \
| * | | | | Disintegrate asm/system.h for ARMDavid Howells2012-03-2812-6/+6
* | | | | | Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-271-0/+1
|\ \ \ \ \ \
| * | | | | | ARM: sa1111: provide a generic way to prevent devices from registeringRussell King2012-03-241-0/+1
* | | | | | | Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-275-17/+79
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'next/fixes-non-critical' into next/driversArnd Bergmann2012-03-206-7/+9
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/driversOlof Johansson2012-03-087-20/+82
| |\ \ \ \ \ \ \
| | * | | | | | | pxa: magician/hx4700: Convert to gpio-regulator from bq24022Heiko Stübner2012-03-062-12/+54
| * | | | | | | | Merge branch 'rtc-sa1100' of git://github.com/hzhuang1/linux into next/driversArnd Bergmann2012-02-285-5/+27
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ARM: pxa: add rtc dummy clockHaojian Zhuang2012-02-284-0/+4
| | * | | | | | | | rtc: sa1100: declare irq in resourceHaojian Zhuang2012-02-281-5/+23
| | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-272-21/+25
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/bo...Arnd Bergmann2012-03-158-20/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | pxa/hx4700: Remove pcmcia platform_device structurePaul Parsons2012-03-141-12/+0
| | * | | | | | | | | ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%Paul Parsons2012-03-142-2/+4
| | * | | | | | | | | ARM: pxa/hx4700: Remove unwanted request for GPIO105Paul Parsons2012-03-141-1/+0
| | | |_|_|/ / / / / | | |/| | | | | | |
OpenPOWER on IntegriCloud