original_kernel/arch/arm/mach-sa1100
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
Kconfig
Makefile
Makefile.boot
assabet.c
badge4.c
cerf.c
clock.c
collie.c
cpu-sa1100.c
cpu-sa1110.c
dma.c
generic.c
generic.h
gpio.c
h3xxx.c
h3100.c
h3600.c
hackkit.c
irq.c
jornada720.c
jornada720_ssp.c
lart.c
leds-assabet.c
leds-badge4.c
leds-cerf.c
leds-hackkit.c
leds-lart.c
leds-simpad.c
leds.c
leds.h
nanoengine.c
neponset.c
pci-nanoengine.c
pleb.c
pm.c
shannon.c
simpad.c
sleep.S
ssp.c
time.c