summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflictMark Brown2012-02-202-161/+162
|\
| * ARM: orion: Fix USB phy for orion5x.Andrew Lunn2012-02-101-1/+2
| * ARM: orion: Fix Orion5x GPIO regression from MPP cleanupAndrew Lunn2012-02-101-160/+160
* | ASoC: Convert kirkwood-openrd to use snd_soc_register_card()Axel Lin2012-02-071-0/+6
* | ASoC: Convert kirkwood-t5325 to use snd_soc_register_card()Axel Lin2012-02-071-0/+6
|/
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-01-121-4/+4
|\
| * arm/PCI: convert to pci_scan_root_bus() for correct root bus resourcesBjorn Helgaas2012-01-061-4/+4
* | Merge tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-097-115/+49
|\ \
| * \ Merge branch 'picoxcell/devel' into next/develOlof Johansson2011-12-202-30/+0
| |\ \
| * | | ARM: Orion: Remove address map info from all platform data structuresAndrew Lunn2011-12-141-11/+5
| * | | ARM: Orion: Get address map from plat-orion instead of via platform_dataAndrew Lunn2011-12-142-3/+1
| * | | ARM: Orion: mbus_dram_info consolidationAndrew Lunn2011-12-144-13/+11
| * | | ARM: Orion: Consolidate the address map setupAndrew Lunn2011-12-141-99/+39
| * | | ARM: Kirkwood: Add configuration for MPP12 as GPIOArnaud Patard2011-12-141-0/+1
| * | | ARM: Kirkwood: Recognize A1 revision of 6282 chipMartin Michlmayr2011-12-142-0/+3
| | |/ | |/|
* | | Merge branch 'restart' into for-linusRussell King2012-01-0517-19/+37
|\ \ \
| * | | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| * | | ARM: restart: kirkwood: use new restart hookRussell King2012-01-0517-15/+37
| |/ /
* | | Merge branch 'devel-stable' into for-linusRussell King2012-01-052-30/+0
|\ \ \ | | |/ | |/|
| * | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-271-5/+0
| * | ARM: mach-kirkwood: remove arch specific special handling for ioremapNicolas Pitre2011-11-181-25/+0
| |/
* / ARM: 7193/1: Fix machine_is_xxx() naming for eSata SheevaPlug and QNAP TS-209Jon Medhurst (Tixy)2011-12-061-3/+3
|/
* Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2011-11-071-18/+24
|\
| * cpuidle: Single/Global registration of idle statesDeepthi Dharwar2011-11-071-14/+16
| * cpuidle: Move dev->last_residency update to driver enter routine; remove dev-...Deepthi Dharwar2011-11-071-4/+8
* | arm: Add export.h to ARM specific files as required.Paul Gortmaker2011-11-011-0/+1
* | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-2816-31/+21
|\ \
| * | ARM: mach-kirkwood: remove mach/memory.hNicolas Pitre2011-09-261-10/+0
| * | ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| * | ARM: mach-kirkwood: convert boot_params to atag_offsetNicolas Pitre2011-08-2114-20/+20
| |/
* | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-272-4/+2
|\ \
| * | ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-082-4/+2
| |/
* / ARM: 7022/1: allow to detect conflicting zreladdrsSascha Hauer2011-10-171-1/+1
|/
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2011-07-301-1/+2
|\
| * PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.Ralf Baechle2011-07-221-1/+2
* | ARM: set vga memory base at run-timeRob Herring2011-07-122-3/+3
* | ARM: convert PCI defines to variablesRob Herring2011-07-121-1/+0
* | ARM: pci: make pcibios_assign_all_busses use pci_has_flagRob Herring2011-07-121-3/+0
|/
* ARM: orion: Refactor the MPP code common in the orion platformAndrew Lunn2011-05-162-61/+3
* ARM: orion: Consolidate setup of the crypto engine.Andrew Lunn2011-05-161-28/+2
* ARM: orion: Consolidate SATA platform setup.Andrew Lunn2011-05-161-27/+3
* ARM: orion: Consolidate USB platform setup code.Andrew Lunn2011-05-161-37/+2
* ARM: orion: Consolidate the XOR platform setup code.Andrew Lunn2011-05-161-189/+6
* ARM: orion: Consolidate the platform data setup for the watchdog.Andrew Lunn2011-05-161-16/+1
* ARM: orion: Consolidate SPI initialization.Andrew Lunn2011-05-161-24/+1
* ARM: orion: Consolidate I2C initialization.Andrew Lunn2011-05-161-30/+1
* ARM: orion: Consolidate ethernet platform dataAndrew Lunn2011-05-161-136/+9
* ARM: kirkwood: Add support for RTC interrupts which allows RTC alarms.Andrew Lunn2011-05-162-1/+2
* ARM: orion: Consolidate the creation of the RTC platform data.Andrew Lunn2011-05-161-7/+1
* ARM: orion: Consolidate the creation of the uart platform data.Andrew Lunn2011-05-161-74/+5