summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-07-252-3/+3
|\
| * Merge branch 'master' into for-nextJiri Kosina2011-07-111-0/+1
| |\
| * | treewide: transciever/transceiver spelling fixesJoe Perches2011-06-242-3/+3
* | | Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-07-256-173/+87
|\ \ \
| * | | ARM: pxa/mioa701: use gpio arrays for global and gsm gpiosPhilipp Zabel2011-07-111-55/+15
| * | | ARM: pxa/hx4700: use gpio arrays for global gpiosPhilipp Zabel2011-07-111-51/+19
| * | | ARM: pxa/magician: use gpio arrays for backlight and global gpiosPhilipp Zabel2011-07-111-34/+23
| * | | ARM: pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIOPhilipp Zabel2011-07-111-1/+2
| * | | ARM: pxa/cm-x300: minor style cleanupIgor Grinberg2011-07-111-5/+4
| * | | ARM: pxa/cm-x300: GPIO cleanupIgor Grinberg2011-07-111-23/+20
| * | | ARM: pxa/cm-x300: fix V3020 RTC functionalityIgor Grinberg2011-07-111-4/+4
| * | | ARM: pxa/saarb: make use of pxa3xx_map_io()Eric Miao2011-07-111-1/+1
| | |/ | |/|
* | | Merge branch 'devel-stable' into for-nextRussell King2011-07-222-4/+3
|\ \ \
| * | | ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_sizeNicolas Pitre2011-07-182-4/+3
| |/ /
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci...Russell King2011-07-2211-74/+59
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| | | * ARM: pm: allow suspend finisher to return error codesRussell King2011-07-022-3/+3
| | | * ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform codeRussell King2011-06-245-7/+9
| | | * ARM: pm: pxa: move cpu_suspend into C codeRussell King2011-06-246-59/+33
| | | * ARM: pm: move cpu_init() call into core codeRussell King2011-06-241-1/+0
| | | * ARM: pm: convert cpu_suspend() to a normal functionRussell King2011-06-241-3/+10
| | | * ARM: pm: move sa1100 to use proper suspend func arg0Russell King2011-06-241-4/+4
| |_|/ |/| |
| | * ARM: pxa/raumfeld: fix device name for codec ak4104Daniel Mack2011-07-111-4/+4
| | * ARM: pxa/raumfeld: display initialisation fixesSven Neumann2011-07-111-14/+15
| | * ARM: pxa/raumfeld: adapt to upcoming hardware changeSven Neumann2011-07-111-5/+6
| | * ARM: pxa: fix PGSR register address calculationPaul Parsons2011-07-061-2/+2
| |/
| * gpio: include linux/gpio.h where neededRandy Dunlap2011-06-161-0/+1
|/
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-05-271-1/+0
|\
| * mtd: pxa: convert to mtd_device_register()Jamie Iles2011-05-251-1/+0
* | Merge branch 'devel-stable' into for-linusRussell King2011-05-231-3/+3
|\ \
| * \ Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into de...Russell King2011-05-071-3/+3
| |\ \ | | |/ | |/|
| | * ARM: zImage: remove the static qualifier from global data variablesNicolas Pitre2011-05-071-3/+3
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
*-----. \ \ Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generi...Russell King2011-05-234-37/+4
|\ \ \ \ \ \
| | | | * | | ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizesRussell King2011-05-122-33/+1
| | | | * | | ARM: Replace platform definition of ISA_DMA_THRESHOLD/MAX_DMA_ADDRESSRussell King2011-05-121-2/+1
| | | |/ / / | | |/| | |
| * | | | | ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a ...Marc Zyngier2011-05-202-2/+2
| | |_|/ / | |/| | |
* | | | | clocksource: convert ARM 32-bit up counting clocksourcesRussell King2011-05-231-15/+2
* | | | | Merge branch 'syscore' into for-linusRafael J. Wysocki2011-05-1729-293/+106
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ARM / PXA: Use struct syscore_ops for "core" power managementRafael J. Wysocki2011-04-2429-293/+106
| | |/ / | |/| |
* | | | ARM: pxa/magician: bq24022 regulator needs to be enabledPhilipp Zabel2011-04-251-1/+1
* | | | ARM: pxa/hx4700: bq24022 regulator needs to be enabledPaul Parsons2011-04-251-1/+1
|/ / /
* | | ARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio()Eric Miao2011-04-134-6/+16
* | | ARM: pxa: align NR_BUILTIN_GPIO with GPIO interrupt numberHaojian Zhuang2011-04-121-1/+1
* | | Fix common misspellingsLucas De Marchi2011-03-313-3/+3
|/ /
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-3041-139/+280
|\ \ | |/ |/|
| * Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King2011-03-2641-139/+280
| |\
| | * ARM: pxa/am300epd: fix leak in am300_init_gpio_regs error pathAxel Lin2011-03-171-6/+7
| | * ARM: pxa/am200epd: fix leak in am200_init_gpio_regs error pathAxel Lin2011-03-171-2/+2
| | * ARM: PXA: Z2: Use switch event for lidVasily Khoruzhick2011-03-161-5/+5
| | * ARM: PXA: Z2: Add default triggers for LEDsVasily Khoruzhick2011-03-161-2/+2
| | * ARM: PXA: Z2: Keep kbd backlight disabled by defaultVasily Khoruzhick2011-03-161-1/+1