summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-096-121/+59
|\
| * Merge branch 'picoxcell/devel' into next/develOlof Johansson2011-12-192-30/+0
| |\
| * | ARM: Orion: Remove address map info from all platform data structuresAndrew Lunn2011-12-131-10/+5
| * | ARM: Orion: Get address map from plat-orion instead of via platform_dataAndrew Lunn2011-12-132-2/+1
| * | ARM: Orion: mbus_dram_info consolidationAndrew Lunn2011-12-134-11/+10
| * | ARM: Orion: Consolidate the address map setupAndrew Lunn2011-12-134-106/+51
* | | Merge branch 'restart' into for-linusRussell King2012-01-0524-19/+41
|\ \ \
| * | | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| * | | ARM: restart: orion5x: use new restart hookRussell King2012-01-0524-15/+41
| |/ /
* | | Merge branch 'devel-stable' into for-linusRussell King2012-01-052-30/+0
|\ \ \ | | |/ | |/|
| * | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-5/+0
| * | ARM: mach-orion5x: 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-1/+1
|/
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-11-071-1/+1
|\
| * mtd: nand: rename NAND_USE_FLASH_BBTBrian Norris2011-09-111-1/+1
| * mtd: nand: consolidate redundant flash-based BBT flagsBrian Norris2011-09-111-1/+1
* | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-2823-36/+24
|\ \
| * \ Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into d...Russell King2011-10-182-13/+1
| |\ \
| | * | ARM: mach-orion5x: remove mach/memory.hNicolas Pitre2011-09-261-12/+0
| | * | ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| * | | Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stableRussell King2011-09-162-1/+2
| |\ \ \ | | |/ / | |/| |
| * | | ARM: mach-orion5x: convert boot_params to atag_offsetNicolas Pitre2011-08-2121-23/+23
| | |/ | |/|
* | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-2714-28/+14
|\ \ \
| * | | ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-0814-28/+14
| |/ /
* | | ARM: platform fixups: remove mdesc argument to fixup functionRussell King2011-10-172-5/+3
* | | ARM: 7022/1: allow to detect conflicting zreladdrsSascha Hauer2011-10-171-1/+1
| |/ |/|
* | ARM: mach-orion5x: add missing header file <linux/vga.h>Bryan Wu2011-08-251-0/+1
* | arm: fix compile failure in orion5x/dns323-setup.cPaul Gortmaker2011-08-251-1/+1
|/
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2011-07-2914-15/+22
|\
| * PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.Ralf Baechle2011-07-2214-15/+22
* | Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-07-262-7/+2
|\ \
| * | ARM: set vga memory base at run-timeRob Herring2011-07-122-3/+2
| * | ARM: convert PCI defines to variablesRob Herring2011-07-121-2/+0
| * | ARM: pci: make pcibios_assign_all_busses use pci_has_flagRob Herring2011-07-121-2/+0
| |/
* | ARM: orion5x: fixup 5181 MPP mask checkImre Kaloz2011-07-181-1/+1
|/
* ARM: orion5x: Refactor mpp code to use common orion platform mpp.Andrew Lunn2011-05-1623-688/+622
* ARM: orion: Consolidate setup of the crypto engine.Andrew Lunn2011-05-161-29/+7
* ARM: orion: Consolidate SATA platform setup.Andrew Lunn2011-05-161-27/+2
* ARM: orion: Consolidate USB platform setup code.Andrew Lunn2011-05-161-62/+4
* ARM: orion: Consolidate the XOR platform setup code.Andrew Lunn2011-05-161-97/+5
* 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-28/+1
* ARM: orion: Consolidate I2C initialization.Andrew Lunn2011-05-161-29/+2
* ARM: orion: Consolidate ethernet platform dataAndrew Lunn2011-05-161-81/+4
* ARM: orion: Consolidate the creation of the uart platform data.Andrew Lunn2011-05-161-76/+5
* ARM: orion: Rename some constants to macros to make code more identicalAndrew Lunn2011-05-161-19/+19
* Fix common misspellingsLucas De Marchi2011-03-314-4/+4
* Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-301-9/+9
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixesRussell King2011-03-281-9/+9
| |\
| | * ARM: orion5x: replace printk with pr_{err,info,...} in ts78xx-setup.cAlexander Clouter2011-03-061-9/+9
OpenPOWER on IntegriCloud