summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linu...Linus Torvalds2012-01-106-126/+125
|\
| * pinctrl: rename U300 and SIRF pin controllersLinus Walleij2012-01-031-1/+1
| * arm/u300: don't use PINMUX_MAP_PRIMARY*Stephen Warren2012-01-031-6/+6
| * pinctrl: move the U300 GPIO driver to pinctrlLinus Walleij2012-01-032-2/+2
| * ARM: u300: localize GPIO assignmentsLinus Walleij2012-01-033-116/+115
| * pinctrl: make a copy of pinmux mapLinus Walleij2012-01-031-1/+1
* | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-092-20/+1
|\ \
| * \ Merge branch 'depends/rmk/restart' into next/cleanupArnd Bergmann2012-01-074-26/+22
| |\ \
| * \ \ Merge branch 'u300/cleanup' into next/cleanupOlof Johansson2011-12-202-20/+1
| |\ \ \
| | * | | ARM: u300: delete memory.hLinus Walleij2011-12-192-20/+1
| | | |/ | | |/|
* | | | Merge branch 'restart' into for-linusRussell King2012-01-054-26/+22
|\ \ \ \ | | |_|/ | |/| |
| * | | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| * | | ARM: restart: lpc32xx & u300: remove unnecessary printkRussell King2012-01-051-1/+0
| * | | ARM: restart: u300: use new restart hookRussell King2012-01-054-23/+24
* | | | ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtimeMarc Zyngier2011-12-181-12/+3
| |/ / |/| |
* | | Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-051-12/+0
|\ \ \
| * | | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-12/+0
| | |/ | |/|
* | | Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/ke...Russell King2011-11-212-24/+2
|\ \ \ | |_|/ |/| |
| * | ARM: u300: convert to MULTI_IRQ_HANDLERJamie Iles2011-11-152-24/+2
| |/
* | ARM: restart: remove local_irq_disable() from within arch_reset()Russell King2011-11-171-2/+0
|/
* Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6Linus Torvalds2011-11-032-59/+2
|\
| * mfd: Delete ab3550 driverLinus Walleij2011-10-242-57/+1
* | Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-015-176/+6
|\ \
| * \ Merge branch 'next/fixes' into next/cleanupArnd Bergmann2011-10-317-307/+198
| |\ \
| | * \ 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
OpenPOWER on IntegriCloud