leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a429638cac
linux/arch/arm/mach-sa1100
History
Linus Torvalds 7b67e75147 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)
  x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
  PCI: Increase resource array mask bit size in pcim_iomap_regions()
  PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES
  PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
  PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
  x86/PCI: amd: factor out MMCONFIG discovery
  PCI: Enable ATS at the device state restore
  PCI: msi: fix imbalanced refcount of msi irq sysfs objects
  PCI: kconfig: English typo in pci/pcie/Kconfig
  PCI/PM/Runtime: make PCI traces quieter
  PCI: remove pci_create_bus()
  xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources
  x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()
  x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
  x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan
  sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources
  sparc/PCI: convert to pci_create_root_bus()
  sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
  powerpc/PCI: convert to pci_create_root_bus()
  powerpc/PCI: split PHB part out of pcibios_map_io_space()
  ...

Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due
to the same patches being applied in other branches.
2012-01-11 18:50:26 -08:00
..
include/mach Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
assabet.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
badge4.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
cerf.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
clock.c ARM: sa1100: clean up of the clock support 2011-12-28 10:42:48 +00:00
collie.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
cpu-sa1100.c Fix common misspellings 2011-03-31 11:26:23 -03:00
cpu-sa1110.c ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. 2010-12-21 14:53:39 +00:00
dma.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
generic.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
generic.h ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
h3xxx.c ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request 2009-12-06 16:52:58 +00:00
h3100.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
h3600.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
hackkit.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
irq.c ARM / SA1100: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
jornada720_ssp.c Fix common misspellings 2011-03-31 11:26:23 -03:00
jornada720.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
Kconfig ARM: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00:00
lart.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
leds-assabet.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-badge4.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-cerf.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-hackkit.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-lart.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds.c ARM: 7026/1: simpad: replace ARM specific LED code 2011-10-17 09:12:42 +01:00
leds.h ARM: 7026/1: simpad: replace ARM specific LED code 2011-10-17 09:12:42 +01:00
Makefile Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-27 08:39:10 +02:00
Makefile.boot ARM: sa1100: fix build error 2011-12-08 14:55:57 +08:00
nanoengine.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
neponset.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
pci-nanoengine.c arm/PCI: convert to pci_scan_root_bus() for correct root bus resources 2012-01-06 12:10:56 -08:00
pleb.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
pm.c ARM: pm: allow suspend finisher to return error codes 2011-07-02 09:54:01 +01:00
shannon.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
simpad.c ARM: restart: sa1100: use new restart hook 2012-01-05 12:57:19 +00:00
sleep.S ARM: pm: sa1100: move cpu_suspend into C code 2011-06-24 08:48:43 +01:00
ssp.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
time.c ARM: 7269/1: mach-sa1100: fix sched_clock breakage 2012-01-05 13:23:02 +00:00