summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-276-409/+20
|\
| * ARM: 7343/1: sa11x0: convert to sparse IRQRussell King2012-03-251-9/+12
| * ARM: 7342/2: sa1100: prepare for sparse irq conversionRob Herring2012-03-251-0/+2
| * Merge branch 'sa11x0-mcp' into sa11x0Russell King2012-03-251-1/+1
| |\
| | * MFD: mcp/ucb1x00: separate ucb1x00 driver data from the MCP dataRussell King2012-02-181-1/+1
| * | Merge branch 'sa11x0-lcd' into sa11x0Russell King2012-03-252-11/+1
| |\ \
| | * | FB: sa11x0: convert to use platform resource and ioremap()Russell King2012-02-241-10/+0
| | * | FB: sa11x0: convert shannon display enable accesses to use GPIO subsystemRussell King2012-02-211-1/+1
| | |/
| * | ARM: sa11x0: remove unused DMA controller definitionsRussell King2012-03-251-217/+2
| * | ARM: sa11x0: remove old SoC private DMA driverRussell King2012-03-251-117/+0
| * | ARM: sa11x0: neponset: move register definitions to neponset.cRussell King2012-02-091-48/+0
| * | ARM: sa11x0: neponset: implement support for sparse IRQsRussell King2012-02-091-8/+0
| * | ARM: sa11x0: neponset: provide function to manipulate NCR_0Russell King2012-02-091-0/+4
| |/
* | Merge branch 'pcmcia' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-235-37/+23
|\ \
| * | PCMCIA: sa11x0: simpad: convert to use new irq/gpio managementRussell King2012-02-211-4/+2
| * | PCMCIA: sa11x0: shannon: convert to use new irq/gpio managementRussell King2012-02-211-8/+4
| * | PCMCIA: sa11x0: nanoengine: convert reset handling to use GPIO subsystemRussell King2012-02-041-2/+2
| * | PCMCIA: sa11x0: nanoengine: convert to use new irq/gpio managementRussell King2012-02-041-4/+4
| * | PCMCIA: sa11x0: cerf: convert reset handling to use GPIO subsystemRussell King2012-02-041-1/+1
| * | PCMCIA: sa11x0: cerf: convert to use new irq/gpio managementRussell King2012-02-041-9/+4
| * | PCMCIA: sa11x0: assabet: convert to use new irq/gpio managementRussell King2012-02-041-9/+6
* | | Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ...Russell King2012-02-221-6/+0
|\ \ \
| * | | ARM: remove disable_fiq and arch_ret_to_user macrosRob Herring2012-02-211-6/+0
| | |/ | |/|
* | | Merge tag 'v3.3-rc2' into depends/rmk/for-armsocOlof Johansson2012-02-071-2/+0
|\ \ \ | |/ /
| * | Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp b...Russell King2012-01-201-2/+0
| |/
* | ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-201-9/+0
|/
* Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-01-141-3/+0
|\
| * GPIO: sa1100: implement proper gpiolib gpio_to_irq conversionRussell King2012-01-131-3/+0
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/same...Linus Torvalds2012-01-131-0/+2
|\ \
| * | ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus.Jochen Friedrich2012-01-091-0/+2
| |/
* | Merge branch 'restart' into for-linusRussell King2012-01-051-13/+0
|\ \
| * | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| * | ARM: restart: sa1100: use new restart hookRussell King2012-01-051-9/+0
* | | Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-051-4/+0
|\ \ \ | |/ / |/| |
| * | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-4/+0
| |/
* | ARM: restart: only perform setup for restart when soft-restartingRussell King2011-11-211-1/+1
|/
* Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-281-1/+1
|\
| * ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
* | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-271-2/+2
|\ \
| * | ARM: 7050/1: mach-sa1100: delete irq_to_gpio() functionLinus Walleij2011-08-221-2/+0
| * | ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-121-0/+2
| |/
* | Merge branch 'misc' into for-linusRussell King2011-10-251-23/+71
|\ \
| * | ARM: 7024/1: simpad: Cleanup CS3 accessors.Jochen Friedrich2011-10-171-23/+58
| * | ARM: 7027/1: simpad: Add ucb1x00 GPIO definitions and register GPIOJochen Friedrich2011-10-171-0/+13
| |/
* | ARM: io: remove IO_SPACE_LIMIT from SA11x0Russell King2011-08-171-4/+2
|/
* Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-261-8/+0
|\
| * ARM: convert PCI defines to variablesRob Herring2011-07-121-7/+0
| * ARM: pci: make pcibios_assign_all_busses use pci_has_flagRob Herring2011-07-121-1/+0
* | ARM: mach-sa1100: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_sizeNicolas Pitre2011-07-181-4/+0
|/
*-. Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generi...Russell King2011-05-231-11/+1
|\ \
OpenPOWER on IntegriCloud