summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linusRussell King2012-07-2714-39/+51
|\ \
| | * ARM: sa11x0/pxa: convert OS timer registers to IOMEMRussell King2012-07-0913-35/+47
| |/ |/|
| * ARM: 7452/1: delay: allow timer-based delay implementation to be selectedWill Deacon2012-07-091-4/+4
|/
* Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-05-291-0/+1
|\
| * ARM: neponset: make sure neponset_ncr_frob() is exportedRussell King2012-05-251-0/+1
* | Merge tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-05-2616-3/+25
|\ \ | |/ |/|
| * Merge branch 'clean/late_initcall_v2' of git://git.linaro.org/people/shawnguo...Olof Johansson2012-05-1116-3/+25
| |\
| | * ARM: sa1100: use machine specific hook for late initShawn Guo2012-05-0816-3/+25
| | |
| \ \
*-. \ \ Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' a...Russell King2012-05-212-8/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| | * ARM: PCI: provide a default bus scan implementationRussell King2012-05-131-7/+1
| |/ |/|
| * arm/sa1100: fix sa1100-rtc memory resourceDmitry Artamonow2012-04-271-1/+1
|/
* ARM: fix lcd power build failure in collie_defconfigPaul Gortmaker2012-04-022-1/+6
* Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-03-291-20/+0
|\
| * ARM: remove bunch of now unused mach/io.h filesRob Herring2012-03-061-20/+0
* | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-287-7/+1
|\ \
| * | Disintegrate asm/system.h for ARMDavid Howells2012-03-288-8/+1
* | | Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-2730-1314/+838
|\ \ \
| * | | ARM: 7343/1: sa11x0: convert to sparse IRQRussell King2012-03-254-12/+12
| * | | ARM: 7342/2: sa1100: prepare for sparse irq conversionRob Herring2012-03-2519-11/+38
| * | | Merge branch 'sa11x0-mcp' into sa11x0Russell King2012-03-259-4/+49
| |\ \ \
| | * | | MFD: mcp-sa11x0/assabet: move assabet reset handling out of mcp-sa11x0.cRussell King2012-02-181-0/+8
| | * | | ARM: sa11x0: add assabet ucb1x00 platform dataRussell King2012-02-181-0/+6
| | * | | MFD: mcp/ucb1x00: separate ucb1x00 driver data from the MCP dataRussell King2012-02-183-3/+13
| | * | | MFD: mcp-sa11x0: convert mcp-sa11x0 to use platform resourcesRussell King2012-02-031-0/+5
| | * | | MFD: mcp-sa11x0: move setup of PPC unit out of mcp-sa11x0.cRussell King2012-02-038-0/+19
| * | | | Merge branch 'sa11x0-lcd' into sa11x0Russell King2012-03-2510-55/+275
| |\ \ \ \
| | * | | | 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
| | * | | | FB: sa1100: remove global sa1100fb_.*_power function pointersRussell King2012-02-215-41/+64
| | * | | | FB: sa1100: move platform data to platform filesRussell King2012-02-218-5/+212
| | | |/ / | | |/| |
| * | | | ARM: sa11x0: remove unused DMA controller definitionsRussell King2012-03-252-218/+3
| * | | | ARM: sa11x0: remove old SoC private DMA driverRussell King2012-03-253-466/+1
| * | | | Merge branch 'sa11x0-ir' into sa11x0Russell King2012-03-251-0/+25
| |\ \ \ \
| | * | | | ARM: sa11x0: add SA-11x0 DMA deviceRussell King2012-03-071-0/+25
| | |/ / /
| * | | | Merge branch 'sa1111' into sa11x0Russell King2012-03-254-38/+19
| |\ \ \ \
| | * | | | ARM: sa11x0: don't static map sa1111Russell King2012-03-243-15/+0
| | * | | | ARM: sa1111: provide a generic way to prevent devices from registeringRussell King2012-03-243-0/+3
| | * | | | ARM: sa11x0: badge4: move board specific ohci initialization to badge4.cRussell King2012-02-091-0/+15
| | |/ / /
| * | | | ARM: sa11x0: neponset: don't static map neponset registersRussell King2012-02-091-6/+1
| * | | | ARM: sa11x0: neponset: move register definitions to neponset.cRussell King2012-02-092-71/+91
| * | | | ARM: sa11x0: assabet/neponest: create neponset device in assabet.cRussell King2012-02-092-43/+25
| * | | | ARM: sa11x0: neponset: suspend/resume in _noirq stateRussell King2012-02-091-9/+15
| * | | | ARM: sa11x0: neponset: place smc91x and sa1111 resources in neponset deviceRussell King2012-02-091-0/+13
| * | | | ARM: sa11x0: neponset: get parent IRQ from neponset device resourceRussell King2012-02-091-7/+13
| * | | | ARM: sa11x0: neponset: implement support for sparse IRQsRussell King2012-02-092-58/+61
| * | | | ARM: sa11x0: neponset: dynamically create neponset child devicesRussell King2012-02-091-28/+28
| * | | | ARM: sa11x0: neponset: save and restore MDM_CTL_0Russell King2012-02-091-11/+42
| * | | | ARM: sa11x0: neponset: add driver .owner initializerRussell King2012-02-091-0/+1
| * | | | ARM: sa11x0: neponset: shuffle some code aroundRussell King2012-02-091-101/+101
| * | | | ARM: sa11x0: neponset: provide function to manipulate NCR_0Russell King2012-02-092-0/+13
OpenPOWER on IntegriCloud