aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into for-nextJiri Kosina2010-08-043-8/+23
|\
| * Merge branch 'misc' into develRussell King2010-07-311-8/+0
| |\
| | * ARM: 6225/1: make TCM allocation static and common for all archsLinus Walleij2010-07-271-8/+0
| | |
| | \
| *-. \ Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl...Russell King2010-07-312-0/+23
| |\ \ \ | | |_|/ | |/| |
| | | * ARM: AMBA: Add pclk definition for platforms using primecellsRussell King2010-07-221-0/+6
| | |/ | |/|
| | * ARM: Convert platform reservations to use LMB rather than bootmemRussell King2010-07-271-2/+2
| | * ARM: Move platform memory reservations out of generic codeRussell King2010-07-161-0/+17
| |/
* | Removing dead MACH_U300_BS26Christoph Egger2010-07-201-7/+0
* | Merge branch 'master' into for-nextJiri Kosina2010-06-163-22/+63
|\ \ | |/
| * ARM: AB3550 board configuration and irq for U300Mattias Wallin2010-05-282-0/+62
| * mfd: Renamed ab3100.h to abx500.hLinus Walleij2010-05-281-1/+1
| * Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2010-05-211-21/+0
| |\
| | * Merge branch 'ioat' into dmaengineDan Williams2010-05-172-0/+2
| | |\
| | * | DMAENGINE: generic channel status v2Linus Walleij2010-03-261-7/+0
| | * | DMAENGINE: generic slave control v2Linus Walleij2010-03-261-14/+0
* | | | fix typos concerning "initiali[zs]e"Uwe Kleine-König2010-06-161-1/+1
|/ / /
* | | Merge branch 'devel-stable' into develRussell King2010-05-172-0/+2
|\ \ \ | | |/ | |/|
| * | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-302-0/+2
| |/
* | ARM: 6034/1: ARM: U300: set f_max to 24 MHz for MMCILinus Walleij2010-04-141-0/+1
* | ARM: 6032/1: ARM: MMCI: support 8bit mode on the ST Micro versionLinus Walleij2010-04-141-1/+1
|/
* Merge branch 'for-next' into for-linusJiri Kosina2010-03-082-3/+3
|\
| * tree-wide: Assorted spelling fixesDaniel Mack2010-02-092-3/+3
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2010-03-041-1/+1
|\ \
| * | DMAENGINE: COH 901 318 descriptor pool refactoringLinus Walleij2010-03-021-1/+1
| |/
* | Merge branches 'clks' and 'pnx' into develRussell King2010-02-251-4/+1
|\ \
| * | ARM: Consolidate clks_register() and similarRussell King2010-02-121-4/+1
| |/
* | Merge branch 'misc2' into develRussell King2010-02-251-1/+1
|\ \
| * | ARM: 5928/1: Change type of VMALLOC_END to unsigned long.Fenkart/Bostandzhyan2010-02-151-1/+1
| |/
* | Merge branch 'tmpreg' into develRussell King2010-02-251-1/+1
|\ \
| * | ARM: 5910/1: ARM: Add tmp register for addruart and loadspTony Lindgren2010-02-121-1/+1
| |/
* | ARM: 5958/1: ARM: U300: fix inverted clk round rateLinus Walleij2010-02-241-12/+12
* | ARM: 5956/1: misplaced parenthesesRoel Kluin2010-02-241-1/+1
* | ARM: 5935/1: [U300] Fix the DMA configurationLinus Walleij2010-02-141-18/+4
* | ARM: 5895/2: Alter name of U300 watchdog resourceLinus Walleij2010-01-271-2/+2
* | ARM: 5852/1: Add COH 901 318 DMA driver platform config for U300Linus Walleij2010-01-272-0/+1108
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2009-12-161-0/+281
|\
| * Add COH 901 318 DMA block driver v5Linus Walleij2009-11-191-0/+281
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-12-091-1/+1
|\ \
| * \ Merge branch 'for-next' into for-linusJiri Kosina2009-12-071-1/+1
| |\ \
| | * | tree-wide: fix misspelling of "definition" in commentsAdam Buchbinder2009-12-041-1/+1
| | |/
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' i...Russell King2009-12-054-60/+342
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| | | * ARM: 5783/1: Make it possible for U300 LDO D to shut downLinus Walleij2009-11-101-0/+1
| | | * ARM: 5725/2: U300 switch MMCI to use regulatorLinus Walleij2009-10-191-60/+4
| | | * ARM: 5724/1: U300 AB3100 boardinfo v5Linus Walleij2009-10-193-0/+337
| | |/ | |/|
* | | ARM: 5787/1: U300 COH 901 331 fixesLinus Walleij2009-11-161-1/+1
|/ /
* | ARM: 5731/2: Fix U300 generic GPIO, remove ifdefs from MMCI v3Linus Walleij2009-10-012-0/+11
* | ARM: 5720/1: Move MMCI header to amba include dirLinus Walleij2009-09-221-2/+2
* | Merge branch 'u300' into develRussell King2009-09-2114-69/+1053
|\ \
| * | ARM: 5678/1: SSP/SPI PL022 polarity terminology fixLinus Walleij2009-09-181-1/+1
| * | ARM: 5704/1: U300 sched_clock implementation v2Linus Walleij2009-09-181-0/+15