summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtdLinus Torvalds2012-06-011-4/+0
|\
| * mtd: nand: kill NAND_NO_AUTOINCR optionBrian Norris2012-05-131-1/+0
| * arm: Use the plat_nand default partition parserH Hartley Sweeten2012-05-131-3/+0
* | Merge branches 'fixes' and 'fixes2' into devel-lateOlof Johansson2012-05-302-80/+47
|\ \
| * | ixp4xx: fix compilation by adding gpiolib supportRichard Cochran2012-05-232-80/+47
| |/
* | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-05-2116-35/+15
|\ \
| * | ARM: PCI: provide a default bus scan implementationRussell King2012-05-1316-21/+15
| * | ARM: PCI: get rid of pci_std_swizzle()Russell King2012-05-1314-14/+0
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-04-1018-27/+56
|\|
| * Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-03-301-0/+1
| |\
| | * ARM: fix builds due to missing <asm/system_misc.h> includesOlof Johansson2012-03-301-0/+1
| * | Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-03-2917-25/+55
| |\ \ | | |/ | |/|
| | * ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbolRob Herring2012-03-251-2/+0
| | * ARM: kill off __mem_pciRob Herring2012-03-061-5/+1
| | * ARM: ixp4xx: use runtime ioremap hookRob Herring2012-03-0616-18/+54
| * | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-282-2/+0
| |\ \
| | * | Disintegrate asm/system.h for ARMDavid Howells2012-03-282-2/+0
* | | | ixp4xx_eth: Support the get_ts_info ethtool method.Richard Cochran2012-04-041-0/+3
|/ / /
* | | Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-233-25/+6
|\ \ \ | | |/ | |/|
| * | Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ...Russell King2012-02-221-6/+0
| |\ \
| | * | ARM: remove disable_fiq and arch_ret_to_user macrosRob Herring2012-02-211-6/+0
| | |/
| * | ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-201-14/+0
| * | ARM: mach-ixp4xx: properly disable CPU idle callNicolas Pitre2012-01-202-5/+6
| |/
* / arm/PCI: get rid of device resource fixupsBjorn Helgaas2012-02-231-2/+2
|/
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-01-111-4/+4
|\
| * arm/PCI: convert to pci_scan_root_bus() for correct root bus resourcesBjorn Helgaas2012-01-061-4/+4
* | Merge branch 'restart' into for-linusRussell King2012-01-0516-25/+38
|\ \
| * | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| * | ARM: restart: ixp4xx: use new restart hookRussell King2012-01-0516-21/+38
* | | ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtimeMarc Zyngier2011-12-181-13/+3
* | | Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-051-5/+0
|\ \ \ | |/ / |/| |
| * | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-5/+0
| |/
* / ARM: restart: only perform setup for restart when soft-restartingRussell King2011-11-211-1/+1
|/
* Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-062-0/+2
|\
| * arm: Add export.h to ARM specific files as required.Paul Gortmaker2011-10-312-0/+2
* | Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-socLinus Torvalds2011-11-015-1/+376
|\ \ | |/ |/|
| * Merge branch 'depends/rmk/devel-stable' into next/boardArnd Bergmann2011-11-0115-38/+21
| |\
| * \ Merge branch 'depends/rmk/gpio' into next/boardArnd Bergmann2011-10-215-8/+7
| |\ \
| * | | ixp4xx: support omicron ixp425 based boardsRichard Cochran2011-09-305-1/+376
* | | | Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2011-10-2814-35/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | ARM: mach-ixp4xx: remove mach/memory.hNicolas Pitre2011-10-131-17/+0
| * | | ARM: add an extra temp register to the low level debugging addruart macroNicolas Pitre2011-09-261-1/+1
| * | | ARM: mach-ixp4xx: convert boot_params to atag_offsetNicolas Pitre2011-08-2112-17/+17
| |/ /
* | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-275-8/+7
|\ \ \ | | |/ | |/|
| * | ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-121-0/+2
| * | ARM: gpio: consolidate gpio_to_irqRussell King2011-08-121-0/+1
| * | ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-084-8/+4
| |/
* | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-10-261-11/+11
|\ \
| * | locking, ARM: Annotate low level hw locks as rawThomas Gleixner2011-09-131-11/+11
| |/
* | Merge branch 'misc' into for-linusRussell King2011-10-252-2/+3
|\ \