android_kernel_samsung_univ.../arch/microblaze/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-compat.h
asm-offsets.h
atomic.h
auxvec.h
bitops.h
bitsperlong.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
checksum.h
clinkage.h
cpuinfo.h microblaze: Unprivileged stream instruction awareness 2011-07-25 09:13:42 +02:00
cputable.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 2011-10-31 16:13:44 -07:00
dma.h
elf.h microblaze: Switch ELF_ARCH code to 189 2011-10-14 12:24:31 +02:00
emergency-restart.h
entry.h
errno.h
exceptions.h
fb.h
fcntl.h
flat.h
ftrace.h
futex.h
gpio.h
hardirq.h
hw_irq.h
io.h
ioctl.h
ioctls.h
ipcbuf.h
irq_regs.h
irq.h microblaze: Remove NO_IRQ from architecture 2012-01-05 08:34:31 +01:00
irqflags.h microblaze/irqs: Do not trace arch_local_{*,irq_*} functions 2011-07-25 09:07:45 +02:00
Kbuild
kdebug.h
kgdb.h
kmap_types.h
linkage.h
local64.h
local.h
mman.h
mmu_context_mm.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mmu_context.h
mmu.h
module.h
msgbuf.h
mutex.h
page.h microblaze: Synchronize __pa __va macros 2012-01-05 08:21:59 +01:00
param.h
parport.h
pci-bridge.h microblaze/PCI: make pcibios_setup_phb_resources() static 2012-01-06 12:11:00 -08:00
pci.h PCI: MicroBlaze: convert pcibios_set_master() to a non-inlined function 2012-01-06 12:10:38 -08:00
percpu.h
pgalloc.h
pgtable.h
poll.h
posix_types.h
processor.h microblaze: Remove duplicated prototype of start_thread() 2011-07-25 09:07:45 +02:00
prom.h Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 2011-07-27 09:24:20 -07:00
ptrace.h ptrace: unify show_regs() prototype 2011-07-26 16:49:43 -07:00
pvr.h microblaze: Unprivileged stream instruction awareness 2011-07-25 09:13:42 +02:00
registers.h
resource.h
scatterlist.h
seccomp.h
sections.h
selfmod.h
sembuf.h
serial.h
setup.h microblaze: Remove eprintk macro 2012-01-05 08:34:26 +01:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
socket.h
sockios.h
stat.h
statfs.h
string.h
swab.h
syscall.h
syscalls.h
system.h microblaze: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW usage 2011-10-14 12:28:42 +02:00
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
uaccess.h microblaze: Fix access_ok macro 2011-10-14 12:24:27 +02:00
ucontext.h
unaligned.h
unistd.h microblaze: Wire-up new system calls 2012-01-05 11:16:51 +01:00
unwind.h
user.h
vga.h
xor.h