kernel-fxtec-pro1x/arch/blackfin/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
atomic.h Blackfin: SMP: convert to common asm-generic/atomic.h 2011-10-25 19:51:23 -04:00
bfin-global.h Blackfin: move internal irq prototypes out of global namespace 2011-05-25 08:13:43 -04:00
bfin-lq035q1.h
bfin5xx_spi.h Blackfin: ppi/spi/twi headers: add missing __BFP undef 2010-10-25 04:54:33 -04:00
bfin_can.h Blackfin: bfin_can.h: add missing VERSION/VERSION2 MMRs 2010-10-22 16:30:03 -04:00
bfin_dma.h Blackfin: bfin_dma.h: start a header for DMA MMR layout 2011-01-10 07:18:04 -05:00
bfin_pfmon.h Blackfin: initial perf_event support 2011-05-25 08:24:09 -04:00
bfin_ppi.h Blackfin: ppi/spi/twi headers: add missing __BFP undef 2010-10-25 04:54:33 -04:00
bfin_rotary.h
bfin_sdh.h
bfin_serial.h blackfin: serial: bfin-uart: remove unused field 2012-01-09 10:26:16 +08:00
bfin_simple_timer.h
bfin_sport.h Blackfin: boards: update ASoC resources after machine driver overhaul 2011-05-25 08:24:14 -04:00
bfin_twi.h Blackfin: ppi/spi/twi headers: add missing __BFP undef 2010-10-25 04:54:33 -04:00
bfin_watchdog.h
bfrom.h
bitops.h Blackfin: bitops: fix include order after little endian inclusion 2011-03-25 16:54:13 -04:00
blackfin.h Blackfin: convert unicode space gremlins 2011-07-23 01:18:23 -04:00
bug.h
byteorder.h
cache.h Blackfin: SMP: fix build breakage in cache.h 2011-01-10 07:18:14 -05:00
cachectl.h Blackfin: add new cacheflush syscall 2010-10-22 03:48:59 -04:00
cacheflush.h Blackfin: don't attempt to flush on-chip L1 SRAM regions 2011-05-25 08:13:41 -04:00
cdef_LPBlackfin.h Blackfin: fix inverted anomaly 05000481 logic 2010-10-25 17:24:00 -04:00
checksum.h
clocks.h
context.S
cplb.h
cplbinit.h
cpu.h blackfin: smp: cleanup smp code 2012-01-09 10:26:15 +08:00
def_LPBlackfin.h Blackfin: fix addr type with bfin_write_{or,and} helpers 2011-05-25 08:24:13 -04:00
delay.h
dma-mapping.h dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
dma.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
dpmc.h Blackfin: dpmc: optimize hibernate/resume path 2011-07-23 01:18:29 -04:00
early_printk.h
elf.h
entry.h m68k{nommu}/blackfin : remove old assembler-only flags bit definitions 2010-10-26 16:52:12 -07:00
fcntl.h
fixed_code.h
flat.h
ftrace.h
gpio.h Blackfin: bf538: pull gpio/port logic out of core hibernate paths 2011-07-23 01:18:30 -04:00
gptimers.h Blackfin: gptimers: add enable/disable by timer id 2011-07-23 01:18:22 -04:00
hardirq.h
io.h Blackfin: switch to asm-generic/io.h 2011-01-10 07:18:04 -05:00
ioctls.h
ipipe.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
ipipe_base.h Blackfin/ipipe: upgrade to I-pipe mainline 2011-03-18 04:01:10 -04:00
irq.h
irq_handler.h Blackfin: bf537: demux port H mask A and emac rx ints 2011-05-25 08:13:43 -04:00
irqflags.h Blackfin: irqs: do not trace arch_local_{*,irq_*} functions 2011-07-23 01:18:33 -04:00
Kbuild Blackfin: merge asm/mutex.h into kbuild too 2011-10-25 19:51:47 -04:00
kgdb.h kgdbts: unify/generalize gdb breakpoint adjustment 2011-05-26 17:12:36 -07:00
l1layout.h
linkage.h
mem_init.h
mem_map.h
mmu.h
mmu_context.h Blackfin: Rename IRQ flags handling functions 2010-10-07 14:08:52 +01:00
module.h Blackfin: convert unicode space gremlins 2011-07-23 01:18:23 -04:00
nand.h
nmi.h
page.h Blackfin: convert unicode space gremlins 2011-07-23 01:18:23 -04:00
page_offset.h
pci.h PCI: Pull PCI 'latency timer' setup up into the core 2012-01-06 12:10:42 -08:00
pda.h Blackfin: optimize double fault boot checking 2011-07-23 01:10:43 -04:00
perf_event.h Blackfin: initial perf_event support 2011-05-25 08:24:09 -04:00
pgtable.h
poll.h
portmux.h
posix_types.h
processor.h Blackfin: SMP: relocate blackfin_core_id() definition 2011-01-10 07:18:15 -05:00
pseudo_instructions.h
ptrace.h ptrace: unify show_regs() prototype 2011-07-26 16:49:43 -07:00
reboot.h
rwlock.h
sections.h Blackfin: convert unicode space gremlins 2011-07-23 01:18:23 -04:00
segment.h
sigcontext.h Blackfin: convert unicode space gremlins 2011-07-23 01:18:23 -04:00
siginfo.h
signal.h
smp.h blackfin: smp: cleanup smp code 2012-01-09 10:26:15 +08:00
spinlock.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
spinlock_types.h
stat.h
string.h
swab.h
syscall.h
system.h Blackfin: SMP: make all barriers handle cache issues 2011-04-13 19:34:04 -04:00
thread_info.h freezer: remove now unused TIF_FREEZE 2011-11-21 12:32:25 -08:00
time.h
timex.h
tlb.h
tlbflush.h
trace.h
traps.h Fix common misspellings 2011-03-31 11:26:23 -03:00
uaccess.h Blackfin: fix sparse warnings in copy_to/from_user 2011-10-25 19:51:35 -04:00
unistd.h Blackfin: wire up new sendmmsg syscall 2011-05-28 17:02:55 -04:00