summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6Linus Torvalds2012-03-302-0/+7
|\
| * mtd: fsmc: Move ALE, CLE defines to their respective platformShiraz Hashim2012-03-272-0/+7
* | Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-03-292-26/+0
|\ \
| * | ARM: create a common IOMEM definitionRob Herring2012-03-131-6/+0
| * | ARM: remove bunch of now unused mach/io.h filesRob Herring2012-03-061-20/+0
* | | Merge branch 'amba' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-234-88/+21
|\ \ \
| * | | ARM: 7335/1: mach-u300: do away with MMC config filesLinus Walleij2012-02-234-88/+21
* | | | Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-233-99/+16
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ...Russell King2012-02-221-16/+0
| |\ \ \
| | * | | ARM: remove disable_fiq and arch_ret_to_user macrosRob Herring2012-02-211-16/+0
| | | |/ | | |/|
| * | | Merge branch 'amba' into for-armsocRussell King2012-01-261-69/+16
| |\ \ \ | | | |/ | | |/|
| | * | ARM: amba: u300: use common amba device initializersRussell King2012-01-261-69/+16
| | * | ARM: amba: u300: get rid of NO_IRQ initializersRussell King2012-01-251-3/+3
| | |/
| * / ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-201-14/+0
| |/
* | Merge tag 'pinctrl-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-03-222-38/+44
|\ \
| * | ARM: u300: configure some pins as an exampleLinus Walleij2012-03-121-2/+16
| * | pinctrl: enhance mapping table to support pin config operationsStephen Warren2012-03-051-6/+6
| * | pinctrl: API changes to support multiple states per deviceStephen Warren2012-03-051-13/+3
| * | pinctrl: assume map table entries can't have a NULL name fieldStephen Warren2012-03-021-4/+4
| * | pinctrl: introduce PINCTRL_STATE_DEFAULT, define hogs as that stateStephen Warren2012-03-021-3/+3
| * | pinctrl: spawn U300 pinctrl from the COH901 GPIOLinus Walleij2012-02-222-15/+17
| * | pinctrl: move generic functions to the pinctrl_ namespaceLinus Walleij2012-02-101-17/+17
| * | pinctrl: break out a pinctrl consumer headerLinus Walleij2012-02-101-1/+1
| |/
* / ARM: U300: Don't specify regulator consumers by struct deviceAxel Lin2012-02-171-2/+0
|/
* 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
| |\ \ \ \