Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 12:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
475c77edf8
linux/arch/arm/mach-orion5x
History
Linus Torvalds 475c77edf8 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 
Pull PCI changes (including maintainer change) from Jesse Barnes:
 "This pull has some good cleanups from Bjorn and Yinghai, as well as
  some more code from Yinghai to better handle resource re-allocation
  when enabled.

  There's also a new initcall_debug feature from Arjan which will print
  out quirk timing information to help identify slow quirks for fixing
  or refinement (Yinghai sent in a few patches to do just that once the
  new debug code landed).

  Beyond that, I'm handing off PCI maintainership to Bjorn Helgaas.
  He's been a core PCI and Linux contributor for some time now, and has
  kindly volunteered to take over.  I just don't feel I have the time
  for PCI review and work that it deserves lately (I've taken on some
  other projects), and haven't been as responsive lately as I'd like, so
  I approached Bjorn asking if he'd like to manage things.  He's going
  to give it a try, and I'm confident he'll do at least as well as I
  have in keeping the tree managed, patches flowing, and keeping things
  stable."

Fix up some fairly trivial conflicts due to other cleanups (mips device
resource fixup cleanups clashing with list handling cleanup, ppc iseries
removal clashing with pci_probe_only cleanup etc)

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (112 commits)
  PCI: Bjorn gets PCI hotplug too
  PCI: hand PCI maintenance over to Bjorn Helgaas
  unicore32/PCI: move <asm-generic/pci-bridge.h> include to asm/pci.h
  sparc/PCI: convert devtree and arch-probed bus addresses to resource
  powerpc/PCI: allow reallocation on PA Semi
  powerpc/PCI: convert devtree bus addresses to resource
  powerpc/PCI: compute I/O space bus-to-resource offset consistently
  arm/PCI: don't export pci_flags
  PCI: fix bridge I/O window bus-to-resource conversion
  x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()'
  PCI / PCIe: Introduce command line option to disable ARI
  PCI: make acpihp use __pci_remove_bus_device instead
  PCI: export __pci_remove_bus_device
  PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge
  PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device
  PCI: print out PCI device info along with duration
  PCI: Move "pci reassigndev resource alignment" out of quirks.c
  PCI: Use class for quirk for usb host controller fixup
  PCI: Use class for quirk for ti816x class fixup
  PCI: Use class for quirk for intel e100 interrupt fixup
  ...
2012-03-23 14:02:12 -07:00
..
include/mach New feature development 2012-01-09 14:38:51 -08:00
addr-map.c ARM: Orion: mbus_dram_info consolidation 2011-12-13 18:46:55 -05:00
common.c ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
common.h New feature development 2012-01-09 14:38:51 -08:00
d2net-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
db88f5281-setup.c mach-orion5x: Fix typo in db88f5281-setup.c and rd88f5182-setup.c 2012-02-21 11:40:36 +01:00
dns323-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
edmini_v2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
irq.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
Kconfig [ARM] Orion: added Buffalo LS-CHL support 2010-12-07 13:50:04 -05:00
kurobox_pro-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ls_hgl-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ls-chl-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
lsmini-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
Makefile [ARM] Orion: added Buffalo LS-CHL support 2010-12-07 13:50:04 -05:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mpp.c ARM: Orion: Get address map from plat-orion instead of via platform_data 2011-12-13 18:46:55 -05:00
mpp.h ARM: orion5x: Refactor mpp code to use common orion platform mpp. 2011-05-16 15:42:59 -04:00
mss2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
mv2120-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
net2big-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
pci.c arm/PCI: get rid of device resource fixups 2012-02-23 20:19:01 -07:00
rd88f5181l-fxo-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
rd88f5181l-ge-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
rd88f5182-setup.c mach-orion5x: Fix typo in db88f5281-setup.c and rd88f5182-setup.c 2012-02-21 11:40:36 +01:00
rd88f6183ap-ge-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
terastation_pro2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ts78xx-fpga.h ARM: orion5x: use safer FPGA ID 'default' for TS-78xx 2011-03-05 14:31:53 -05:00
ts78xx-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ts209-setup.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
ts409-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
tsx09-common.c Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2008-10-11 10:09:45 -07:00
tsx09-common.h [ARM] Orion: remove code duplication in TS209 and TS409 setup files 2008-06-22 22:44:54 +02:00
wnr854t-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
wrt350n-v2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00