alistair23-linux/arch/arm/mach-mmp
Linus Torvalds 3960ef326a Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: Consolidate the clkdev header files
  ARM: set vga memory base at run-time
  ARM: convert PCI defines to variables
  ARM: pci: make pcibios_assign_all_busses use pci_has_flag
  ARM: remove unnecessary mach/hardware.h includes
  pci: move microblaze and powerpc pci flag functions into asm-generic
  powerpc: rename ppc_pci_*_flags to pci_*_flags

Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h
2011-07-26 17:12:10 -07:00
..
include/mach 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
aspenite.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
avengers_lite.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
brownstone.c mmc: update mmp2 mmc resources in arch/arm 2011-07-20 17:20:50 -04:00
clock.c
clock.h ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
common.c
common.h
devices.c
flint.c ARM: mmp: correct the naming of GPIOxx_GPIO definitions 2010-12-20 23:07:47 +08:00
irq-mmp2.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
irq-pxa168.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
jasper.c mmc: update mmp2 mmc resources in arch/arm 2011-07-20 17:20:50 -04:00
Kconfig ARM: mmp: select CPU_PJ4 2010-12-18 21:02:16 +08:00
Makefile ARM: mmp: append brownstone support 2010-12-16 14:31:18 +08:00
Makefile.boot
mmp2.c mmc: update mmp2 mmc resources in arch/arm 2011-07-20 17:20:50 -04:00
pxa168.c ARM: pxa168: correct nand pmu setting 2011-07-06 23:51:36 +08:00
pxa910.c ARM: pxa910: correct nand pmu setting 2011-07-06 23:51:22 +08:00
tavorevb.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
teton_bga.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
time.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ttc_dkb.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00