Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 04:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
28c569f695
linux/arch/unicore32/kernel
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
..
asm-offsets.c unicore32 core architecture: generic elf and ksyms stuff 2011-03-17 09:19:05 +08:00
clock.c unicore32 io: redefine __REG(x) and re-use readl/writel funcs 2011-03-17 09:19:19 +08:00
cpu-ucv2.c unicore32 additional architecture files: pm related files 2011-03-17 09:19:11 +08:00
debug-macro.S unicore32 additional architecture files: low-level lib: ocd debug 2011-03-17 09:19:12 +08:00
debug.S unicore32 additional architecture files: low-level lib: ocd debug 2011-03-17 09:19:12 +08:00
dma.c unicore32 io: redefine __REG(x) and re-use readl/writel funcs 2011-03-17 09:19:19 +08:00
early_printk.c unicore32 additional architecture files: low-level lib: ocd debug 2011-03-17 09:19:12 +08:00
elf.c unicore32 core architecture: generic elf and ksyms stuff 2011-03-17 09:19:05 +08:00
entry.S unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs 2011-03-17 09:19:21 +08:00
fpu-ucf64.c unicore32 additional architecture files: float point handling 2011-03-17 09:19:11 +08:00
gpio.c unicore32 io: redefine __REG(x) and re-use readl/writel funcs 2011-03-17 09:19:19 +08:00
head.S Fix common misspellings 2011-03-31 11:26:23 -03:00
hibernate_asm.S unicore32 additional architecture files: pm related files 2011-03-17 09:19:11 +08:00
hibernate.c unicore32 additional architecture files: pm related files 2011-03-17 09:19:11 +08:00
init_task.c unicore32 core architecture: process/thread related codes 2011-03-17 09:19:07 +08:00
irq.c PM / UNICORE32: Use struct syscore_ops instead of sysdevs for PM 2011-05-11 21:37:15 +02:00
ksyms.c unicore32: fix build error for find bitops 2011-11-15 17:13:14 +08:00
ksyms.h unicore32 core architecture: generic elf and ksyms stuff 2011-03-17 09:19:05 +08:00
Makefile unicore32: move rtc-puv3.c to drivers/rtc directory 2011-06-09 16:15:24 +08:00
module.c modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
pci.c PCI: UniCore: convert pcibios_set_master() to a non-inlined function 2012-01-06 12:10:41 -08:00
pm.c unicore32 additional architecture files: pm related files 2011-03-17 09:19:11 +08:00
process.c nohz: Remove tick_nohz_idle_enter_norcu() / tick_nohz_idle_exit_norcu() 2011-12-11 10:31:57 -08:00
ptrace.c unicore32 additional architecture files: ptrace handling 2011-03-17 09:19:12 +08:00
puv3-core.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
puv3-nb0916.c unicore32: Remove IRQF_DISABLED 2012-01-10 10:29:41 +08:00
pwm.c unicore32 core architecture: timer and time handling 2011-03-17 09:19:10 +08:00
setup.c unicore32: standardize /proc/iomem "Kernel code" name 2012-01-10 10:29:40 +08:00
setup.h unicore32 core architecture: low level entry and setup codes 2011-03-17 09:19:06 +08:00
signal.c unicore32: Use set_current_blocked() 2012-01-10 10:29:41 +08:00
sleep.S unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs 2011-03-17 09:19:21 +08:00
stacktrace.c unicore32 core architecture: process/thread related codes 2011-03-17 09:19:07 +08:00
sys.c unicore32 core architecture: processor and system headers 2011-03-17 09:19:06 +08:00
time.c unicore32: Remove IRQF_DISABLED 2012-01-10 10:29:41 +08:00
traps.c sysfs: remove "last sysfs file:" line from the oops messages 2011-05-13 16:05:51 -07:00
vmlinux.lds.S unicore32: change PERCPU to PERCPU_SECTION 2011-06-09 16:27:46 +08:00