kevin/linux
1
Fork 0
Code
7b67e75147
linux/arch/blackfin
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
..
boot
configs blackfin: config: update def config for all boards 2012-01-09 10:26:15 +08:00
include Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-01-11 18:50:26 -08:00
kernel blackfin: time-ts: rm unused func broadcast_timer_setup() 2012-01-09 10:26:16 +08:00
lib
mach-bf518 blackfin: mac: dsa: add vlan mask in board file 2012-01-09 10:26:16 +08:00
mach-bf527 blackfin: config: update macro SPI_BFIN in board file 2012-01-09 10:26:15 +08:00
mach-bf533 blackfin: i2c-lcd: change default clock rate 2012-01-09 10:26:16 +08:00
mach-bf537 blackfin: bf537: add capture support 2012-01-09 10:26:17 +08:00
mach-bf538 blackfin: config: update macro SPI_BFIN in board file 2012-01-09 10:26:15 +08:00
mach-bf548 blackfin: bf548: add capture support 2012-01-09 10:26:16 +08:00
mach-bf561 blackfin: bf561: add adv7183 capture support 2012-01-09 10:26:17 +08:00
mach-common blackfin: smp: fix msg queue overflow issue 2012-01-09 10:26:15 +08:00
mm blackfin: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:01 -04:00
oprofile
ADI_BSD.txt
Kconfig
Kconfig.debug
Makefile