Linus Torvalds 4406c56d0a Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ... * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (75 commits) PCI hotplug: clean up acpi_run_hpp() PCI hotplug: acpiphp: use generic pci_configure_slot() PCI hotplug: shpchp: use generic pci_configure_slot() PCI hotplug: pciehp: use generic pci_configure_slot() PCI hotplug: add pci_configure_slot() PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface PCI hotplug: acpiphp: don't cache hotplug_params in acpiphp_bridge PCI hotplug: acpiphp: remove superfluous _HPP/_HPX evaluation PCI: Clear saved_state after the state has been restored PCI PM: Return error codes from pci_pm_resume() PCI: use dev_printk in quirk messages PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset() PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle PCI Hotplug: acpiphp: find bridges the easy way PCI: pcie portdrv: remove unused variable PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI support ACPI PM: Replace wakeup.prepared with reference counter PCI PM: Introduce device flag wakeup_prepared PCI / ACPI PM: Rework some debug messages PCI PM: Simplify PCI wake-up code ... Fixed up conflict in arch/powerpc/kernel/pci_64.c due to OF device tree scanning having been moved and merged for the 32- and 64-bit cases. The 'needs_freset' initialization added in 6e19314cc ("PCI/powerpc: support PCIe fundamental reset") is now in arch/powerpc/kernel/pci_of_scan.c.		2009-09-16 07:49:54 -07:00
..
agp.h	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
asmregs.h
assembly.h
atomic.h	parisc: use generic atomic64 on 32-bit	2009-07-03 03:34:13 +00:00
auxvec.h
bitops.h
bitsperlong.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
checksum.h
compat.h
compat_rt_sigframe.h
compat_signal.h
compat_ucontext.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h	parisc: remove CVS keywords	2009-07-03 03:34:06 +00:00
eisa_bus.h
eisa_eeprom.h
elf.h
emergency-restart.h
errno.h
fb.h
fcntl.h
fixmap.h
floppy.h
ftrace.h
futex.h
grfioctl.h
hardirq.h
hardware.h
hw_irq.h
ide.h
io.h
ioctl.h
ioctls.h
ipcbuf.h
irq.h
irq_regs.h
Kbuild
kdebug.h
kmap_types.h	kmap_types: make most arches use generic header file	2009-06-16 19:47:51 -07:00
led.h
linkage.h
local.h
machdep.h
mc146818rtc.h
mckinley.h
mman.h
mmu.h
mmu_context.h
mmzone.h
module.h
msgbuf.h
mutex.h
page.h	asm-generic: rename page.h and uaccess.h	2009-06-11 21:02:17 +02:00
param.h
parisc-device.h
parport.h
pci.h	PCI: remove pcibios_scan_all_fns()	2009-09-09 13:29:18 -07:00
pdc.h
pdc_chassis.h
pdcpat.h
percpu.h
perf.h
perf_counter.h	parisc: perf: wire up sys_perf_counter_open	2009-07-03 03:34:12 +00:00
pgalloc.h
pgtable.h
poll.h
posix_types.h
prefetch.h
processor.h	parisc: add task_pt_regs macro	2009-07-03 03:34:11 +00:00
psw.h
ptrace.h
real.h
resource.h
ropes.h
rt_sigframe.h
rtc.h
runway.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: implement a SO_DOMAIN getsockoption	2009-08-05 13:02:57 -07:00
sockios.h
spinlock.h
spinlock_types.h
stat.h
statfs.h
string.h
superio.h
swab.h
system.h	parisc: fix ldcw inline assembler	2009-07-03 03:34:07 +00:00
termbits.h
termios.h
thread_info.h	KEYS: Extend TIF_NOTIFY_RESUME to (almost) all architectures [try #6]	2009-09-02 21:29:19 +10:00
timex.h
tlb.h	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	2009-07-27 12:10:38 -07:00
tlbflush.h	parisc: ensure broadcast tlb purge runs single threaded	2009-07-03 03:34:09 +00:00
topology.h
traps.h
types.h
uaccess.h	asm-generic: rename page.h and uaccess.h	2009-06-11 21:02:17 +02:00
ucontext.h
unaligned.h
unistd.h	parisc: wire sys_perf_counter_open to sys_ni_syscall	2009-07-03 03:34:11 +00:00
unwind.h
user.h
vga.h
xor.h