summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge branch 'depends/rmk/memory_h' into next/fixesArnd Bergmann2011-10-314-11/+9
| | |\ \
| * | \ \ Merge branch 'depends/rmk/devel-stable' into next/cleanupArnd Bergmann2011-10-083-7/+5
| |\ \ \ \
| * | | | | mach-u300: retire AVE deviceLinus Walleij2011-08-171-54/+0
| * | | | | mach-u300: delete bogus memory mappingsLinus Walleij2011-08-171-19/+0
| * | | | | mach-u300: drop SEMI config optionLinus Walleij2011-08-172-16/+1
| * | | | | mach-u300: retire odd singlemem variantLinus Walleij2011-08-174-88/+5
| | |_|_|/ | |/| | |
* | | | | ARM: mark empty gpio.h files emptyLinus Walleij2011-10-291-0/+1
* | | | | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-284-11/+9
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| | |/ / | |/| |
| * | | Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into dev...Russell King2011-08-232-5/+5
| |\ \ \
| | * | | ARM: mach-u300: convert boot_params to atag_offsetNicolas Pitre2011-08-212-5/+5
| | |/ /
| * | | ARM: mach-u300: Setup consistent dma size at boot timeJon Medhurst2011-08-222-5/+3
| |/ /
* | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-276-306/+197
|\ \ \ | | |/ | |/|
| * | ARM: 7083/1: rewrite U300 GPIO to use gpiolibLinus Walleij2011-09-085-184/+69
| * | ARM: 7034/1: mach-u300: delete irq_to_gpio() functionLinus Walleij2011-08-221-9/+0
| * | ARM: 7033/1: mach-u300: break out GPIO driver specificsLinus Walleij2011-08-223-246/+258
| * | ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-121-0/+2
| * | ARM: gpio: consolidate gpio_to_irqRussell King2011-08-121-0/+1
| |/
* | Merge branch 'for-next' of git://git.linaro.org/people/triad/linux-pinctrlLinus Torvalds2011-10-258-581/+85
|\ \
| * | pinctrl: add a driver for the U300 pinmuxLinus Walleij2011-10-138-581/+85
| |/
* | ARM: 7022/1: allow to detect conflicting zreladdrsSascha Hauer2011-10-171-2/+2
|/
* Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-07-262-23/+14
|\
| * mach-u300: set apropriate FIFO trigger levelsLinus Walleij2011-06-231-2/+2
| * mach-u300: cleanup clockevent codeLinus Walleij2011-06-231-21/+12
* | Merge branch 'master' into for-nextJiri Kosina2011-07-113-15/+12
|\ \ | |/
| * ARM: 6949/2: mach-u300: fix compilaton warning in IO accessorsLinus Walleij2011-06-092-13/+11
| * ARM: 6947/2: mach-u300: fix compilation error in timerLinus Walleij2011-06-061-2/+1
* | treewide: Convert uses of struct resource to resource_size(ptr)Joe Perches2011-06-101-1/+1
|/
* gpio: move U300 GPIO driver to drivers/gpioLinus Walleij2011-05-262-701/+1
* clocksource: convert ARM 32-bit up counting clocksourcesRussell King2011-05-231-15/+3
* Fix common misspellingsLucas De Marchi2011-03-311-3/+3
* Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-174-164/+203
|\
| * mach-u300: define a dummy filter function for coh901318Linus Walleij2011-03-141-0/+7
| * mach-u300: config U300 PL180 PL011 PL022 for DMALinus Walleij2011-03-143-29/+183
| * mach-u300: use mmci driver for GPIO card detectLinus Walleij2011-03-141-135/+13
* | ARM: P2V: separate PHYS_OFFSET from platform definitionsRussell King2011-02-172-4/+4
|/
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-132-3/+3
|\
| * Merge branch 'master' into for-nextJiri Kosina2010-12-221-1/+1
| |\
| * | tree-wide: fix comment/printk typosUwe Kleine-König2010-11-012-3/+3
* | | Merge branch 'misc' into develRussell King2011-01-061-1/+1
|\ \ \
| * | | ARM: 6483/1: arm & sh: factorised duplicated clkdev.cJean-Christop PLAGNIOL-VILLARD2010-11-261-1/+1
| | |/ | |/|
* | | ARM: u300: convert sched_clock() to use new infrastructureRussell King2010-12-221-4/+13
* | | ARM: ensure all sched_clock() implementations are notrace markedRussell King2010-12-221-0/+1
* | | ARM: U300: update clock source registrationRussell King2010-12-221-3/+1
|/ /
* | Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-11-011-1/+1
|\ \ | |/ |/|
| * spi/pl022: fix erroneous platform data in U300Linus Walleij2010-11-011-1/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Woodhouse2010-10-304-20/+8
|\ \ | |/
| * Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-10-212-8/+5
| |\
| | * arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre2010-10-201-2/+0
| | * arm: return both physical and virtual addresses from addruartJeremy Kerr2010-10-201-6/+5
OpenPOWER on IntegriCloud