linux/arch/xtensa/include/asm
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.h
asmmacro.h
atomic.h atomic: cleanup asm-generic atomic*.h inclusion 2011-07-26 16:49:47 -07:00
auxvec.h
bitops.h asm-generic: add another generic ext2 atomic bitops 2011-07-26 16:49:46 -07:00
bitsperlong.h
bootparam.h
bug.h
bugs.h
byteorder.h
cache.h
cacheasm.h
cacheflush.h
checksum.h
coprocessor.h
cpumask.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h Fix common misspellings 2011-03-31 11:26:23 -03:00
elf.h
emergency-restart.h
errno.h
fb.h
fcntl.h
flat.h
ftrace.h
futex.h
gpio.h
hardirq.h
highmem.h
hw_irq.h
io.h
ioctl.h
ioctls.h
ipcbuf.h
irq_regs.h
irq.h
irqflags.h
Kbuild
kdebug.h
kmap_types.h
linkage.h
local64.h
local.h
mman.h
mmu_context.h
mmu.h
module.h
msgbuf.h
mutex.h
nommu_context.h
nommu.h
page.h xtensa/mm: remove WANT_PAGE_VIRTUAL 2011-05-25 08:39:02 -07:00
param.h
pci-bridge.h
pci.h PCI: Xtensa: convert pcibios_set_master() to a non-inlined function 2012-01-06 12:10:41 -08:00
percpu.h
pgalloc.h
pgtable.h
platform.h
poll.h
posix_types.h h8300/m68k/xtensa: __FD_ISSET should return 0/1 2011-07-26 16:49:43 -07:00
processor.h
ptrace.h ptrace: unify show_regs() prototype 2011-07-26 16:49:43 -07:00
regs.h
resource.h
rmap.h
rwsem.h
scatterlist.h
sections.h
segment.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h
socket.h net: add wireless TX status socket option 2011-11-09 16:01:02 -05:00
sockios.h
spinlock.h
stat.h
statfs.h
string.h
swab.h
syscall.h
system.h
termbits.h
termios.h
thread_info.h freezer: remove now unused TIF_FREEZE 2011-11-21 12:32:25 -08:00
timex.h
tlb.h
tlbflush.h
topology.h
types.h consolidate umode_t declarations 2012-01-03 22:55:17 -05:00
uaccess.h Merge 'akpm' patch series 2011-07-25 21:00:19 -07:00
ucontext.h
unaligned.h
unistd.h All Arch: remove linkage for sys_nfsservctl system call 2011-08-26 15:09:58 -07:00
user.h
vga.h
xor.h