lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
a7fadac10f
linux-kernel-test/arch/arm/mach-ixp4xx
History
Arnd Bergmann a7fadac10f Merge branch 'depends/rmk/devel-stable' into next/board 
The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos4/include/mach/entry-macro.S
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-exynos4/mct.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 00:11:41 +01:00
..
include/mach Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
avila-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
avila-setup.c ARM: mach-ixp4xx: convert boot_params to atag_offset 2011-08-21 17:14:56 -04:00
common-pci.c Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
common.c ARM: fix regression in IXP4xx clocksource 2011-07-15 18:02:35 -07:00
coyote-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
coyote-setup.c ARM: mach-ixp4xx: convert boot_params to atag_offset 2011-08-21 17:14:56 -04:00
dsmg600-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
dsmg600-setup.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
fsg-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
fsg-setup.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
gateway7001-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
gateway7001-setup.c ARM: mach-ixp4xx: convert boot_params to atag_offset 2011-08-21 17:14:56 -04:00
goramo_mlr.c ARM: mach-ixp4xx: convert boot_params to atag_offset 2011-08-21 17:14:56 -04:00
gtwx5715-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
gtwx5715-setup.c ARM: mach-ixp4xx: convert boot_params to atag_offset 2011-08-21 17:14:56 -04:00
ixdp425-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
ixdp425-setup.c ARM: mach-ixp4xx: convert boot_params to atag_offset 2011-08-21 17:14:56 -04:00
ixdpg425-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
ixp4xx_npe.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ixp4xx_qmgr.c IXP4xx: Fix qmgr_release_queue() flushing unexpected queue entries. 2011-02-06 16:49:48 +01:00
Kconfig ixp4xx: support omicron ixp425 based boards 2011-09-30 22:18:42 +02:00
Makefile ixp4xx: support omicron ixp425 based boards 2011-09-30 22:18:42 +02:00
Makefile.boot
miccpt-pci.c ixp4xx: support omicron ixp425 based boards 2011-09-30 22:18:42 +02:00
nas100d-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
nas100d-setup.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
nslu2-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
nslu2-setup.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
omixp-setup.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
vulcan-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
vulcan-setup.c ARM: mach-ixp4xx: convert boot_params to atag_offset 2011-08-21 17:14:56 -04:00
wg302v2-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
wg302v2-setup.c ARM: mach-ixp4xx: convert boot_params to atag_offset 2011-08-21 17:14:56 -04:00