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
apb.h
apc.h
asi.h	sparc,leon: Redefine MMU register access asi if CONFIG_LEON	2009-08-17 18:32:09 -07:00
asm.h	sparc: Add asm/asm.h	2008-12-09 00:50:13 -08:00
asmmacro.h
atomic_32.h	asm-generic: rename atomic.h to atomic-long.h	2009-06-11 21:02:17 +02:00
atomic_64.h	asm-generic: rename atomic.h to atomic-long.h	2009-06-11 21:02:17 +02:00
atomic.h
auxio_32.h
auxio_64.h
auxio.h
auxvec.h
backoff.h
bbc.h
bitext.h
bitops_32.h	sparc: asm/bitops.h should define __fls	2008-12-03 16:04:52 -08:00
bitops_64.h	sparc64: Stop using memory barriers for atomics and locks.	2008-12-04 09:16:47 -08:00
bitops.h
bitsperlong.h	asm-generic: introduce asm/bitsperlong.h	2009-06-11 21:02:14 +02:00
btfixup.h
bug.h
bugs.h
byteorder.h	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
cache.h
cacheflush_32.h
cacheflush_64.h
cacheflush.h
chafsr.h
checksum_32.h
checksum_64.h
checksum.h
chmctrl.h
clock.h
cmt.h
compat_signal.h
compat.h	x86-64: seccomp: fix 32/64 syscall hole	2009-03-02 15:41:30 -08:00
contregs.h
cpudata_32.h
cpudata_64.h	sparc64: Move trap_block[] definitions into a new header file.	2009-06-16 04:56:08 -07:00
cpudata.h
cputime.h
current.h
cypress.h
dcr.h
dcu.h
delay_32.h
delay_64.h
delay.h
device.h	Driver Core: Add platform device arch data V3	2009-07-22 00:28:38 +02:00
display7seg.h
div64.h
dma-mapping.h	sparc: Add CONFIG_DMA_API_DEBUG support	2009-08-10 09:35:00 +02:00
dma.h
ebus_dma.h
ecc.h
eeprom.h
elf_32.h	[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY	2008-10-16 15:40:05 +02:00
elf_64.h	sparc64: Fix SET_PERSONALITY to not clip bits outside of PER_MASK.	2009-05-07 15:36:13 -07:00
elf.h
emergency-restart.h
envctrl.h
errno.h	cfg80211: errno.h: define ERFKILL	2009-06-07 05:01:00 -07:00
estate.h
fb.h
fbio.h
fcntl.h
fhc.h
fixmap.h
floppy_32.h
floppy_64.h
floppy.h
fpumacro.h
ftrace.h	sparc64: Add proper dynamic ftrace support.	2009-06-16 04:56:53 -07:00
futex_32.h
futex_64.h
futex.h
gpio.h
hardirq_32.h
hardirq_64.h
hardirq.h
head_32.h
head_64.h
head.h
highmem.h
hugetlb.h
hvtramp.h
hw_irq.h
hypervisor.h	sparc64: Add performance counter hypervisor calls for sun4v.	2008-12-04 09:17:09 -08:00
ide.h
idprom.h
intr_queue.h
io_32.h
io_64.h
io-unit.h
io.h
ioctl.h
ioctls.h
iommu_32.h
iommu_64.h
iommu.h
ipcbuf.h	sparc: unify ipcbuf.h	2009-01-04 15:44:52 -08:00
irq_32.h	sparc: fix sparse warnings in irq_32.c	2008-12-08 01:08:24 -08:00
irq_64.h	debug lockups: Improve lockup detection, fix generic arch fallback	2009-08-03 09:56:52 +02:00
irq_regs.h
irq.h
irqflags_32.h
irqflags_64.h	sparc64: Make %pil level 15 a pseudo-NMI.	2008-12-04 09:17:02 -08:00
irqflags.h
jsflash.h	sparc: fix warning in userspace header jsflash.h	2009-01-02 21:31:13 -08:00
Kbuild	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
kdebug_32.h	sparc32: kernel/trace/trace.c wants DIE_OOPS	2008-11-01 21:44:01 -07:00
kdebug_64.h	sparc64: Implement NMI watchdog on capable cpus.	2009-01-30 00:03:53 -08:00
kdebug.h
kgdb.h
kmap_types.h	kmap_types: make most arches use generic header file	2009-06-16 19:47:51 -07:00
kprobes.h
ldc.h
leon_amba.h	sparc,leon: CONFIG_SPARC_LEON option and leon specific files.	2009-08-17 18:32:09 -07:00
leon.h	sparc,leon: CONFIG_SPARC_LEON option and leon specific files.	2009-08-17 18:32:09 -07:00
linkage.h
lmb.h
local.h
lsu.h
machines.h	sparc,leon: Introduce the sparc-leon CPU type.	2009-08-17 18:32:10 -07:00
mbus.h
mc146818rtc_32.h
mc146818rtc_64.h
mc146818rtc.h
mdesc.h	sparc64: Make mdesc_fill_in_cpu_data take a cpumask_t pointer.	2009-06-16 04:56:21 -07:00
memctrl.h
memreg.h
mman.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
mmu_32.h
mmu_64.h
mmu_context_32.h
mmu_context_64.h	cpumask: use mm_cpumask() wrapper: sparc	2009-03-16 14:40:39 +10:30
mmu_context.h
mmu.h
mmzone.h	numa, cpumask: move numa_node_id default implementation to topology.h, fix	2009-03-19 12:51:25 +01:00
module.h	sparc: unify module.h	2008-12-26 15:35:41 -08:00
mpmbox.h
msgbuf.h
msi.h
mutex.h
mxcc.h
nmi.h	sparc64: Initial hw perf counter support.	2009-09-10 06:28:20 -07:00
ns87303.h
obio.h
of_device.h
of_platform.h
openprom.h	sparc: unify openprom.h	2009-01-02 21:15:25 -08:00
openpromio.h
oplib_32.h	sparc: Kill exports of prom internal functions	2009-01-08 16:58:42 -08:00
oplib_64.h	sparc: Kill exports of prom internal functions	2009-01-08 16:58:42 -08:00
oplib.h
page_32.h	asm-generic: rename page.h and uaccess.h	2009-06-11 21:02:17 +02:00
page_64.h	asm-generic: rename page.h and uaccess.h	2009-06-11 21:02:17 +02:00
page.h
param.h
parport.h	parport: Fix various uses of parport_pc	2009-04-14 08:48:50 -07:00
pbm.h
pci_32.h	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-09-16 07:49:54 -07:00
pci_64.h	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-09-16 07:49:54 -07:00
pci.h	sparc: Use asm-generic/pci-dma-compat	2009-08-10 09:35:00 +02:00
pcic.h
pcr.h	sparc64: Implement NMI watchdog on capable cpus.	2009-01-30 00:03:53 -08:00
percpu_32.h
percpu_64.h	sparc64: Get rid of real_setup_per_cpu_areas().	2009-06-16 04:56:23 -07:00
percpu.h
perf_counter.h	sparc64: Initial hw perf counter support.	2009-09-10 06:28:20 -07:00
perfctr.h
pgalloc_32.h	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	2009-07-27 12:10:38 -07:00
pgalloc_64.h
pgalloc.h
pgtable_32.h
pgtable_64.h	sparc64: Validate linear D-TLB misses.	2009-08-25 16:47:46 -07:00
pgtable.h
pgtsrmmu.h	sparc,leon: Introduce the sparc-leon CPU type.	2009-08-17 18:32:10 -07:00
pgtsun4.h
pgtsun4c.h
pil.h	sparc64: Reschedule KGDB capture to a software interrupt.	2009-03-18 23:51:57 -07:00
poll.h
posix_types.h	sparc: unify posix_types.h	2009-01-02 18:35:29 -08:00
processor_32.h	sparc: add '32' suffix to reg_window, sigcontext, __siginfo_t	2009-01-02 19:32:59 -08:00
processor_64.h	sparc64: Kill annoying warning when building compat_binfmt_elf.o	2008-11-02 00:15:38 -07:00
processor.h
prom.h	sparc,leon: Introduce the sparc-leon CPU type.	2009-08-17 18:32:10 -07:00
psr.h
psrcompat.h
pstate.h
ptrace.h	sparc: unify ptrace.h	2009-01-02 19:42:12 -08:00
resource.h
ross.h
rwsem-const.h
rwsem.h
sbi.h
scatterlist.h	sparc: use sparc64 version of scatterlist.h	2008-12-11 20:24:58 -08:00
scratchpad.h
seccomp.h	x86-64: seccomp: fix 32/64 syscall hole	2009-03-02 15:41:30 -08:00
sections.h	sparc: unify sections.h	2008-12-27 00:35:12 -08:00
sembuf.h
serial.h
setup.h
sfafsr.h
sfp-machine_32.h
sfp-machine_64.h
sfp-machine.h
shmbuf.h
shmparam_32.h
shmparam_64.h
shmparam.h
sigcontext.h	sparc: unify sigcontext.h	2009-01-02 19:34:46 -08:00
siginfo.h	sparc: unify siginfo.h	2009-01-02 21:10:04 -08:00
signal.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
smp_32.h	sparc: remove NO_PROC_ID - it is no longer used	2009-01-02 21:33:54 -08:00
smp_64.h	cpumask: arch_send_call_function_ipi_mask: sparc	2009-03-16 14:40:22 +10:30
smp.h
smpprim.h
socket.h	net: implement a SO_DOMAIN getsockoption	2009-08-05 13:02:57 -07:00
sockios.h
sparsemem.h
spinlock_32.h	locking, sparc: Rename __spin_try_lock() and friends	2009-08-31 18:08:48 +02:00
spinlock_64.h	locking, sparc: Rename __spin_try_lock() and friends	2009-08-31 18:08:48 +02:00
spinlock_types.h
spinlock.h
spitfire.h	sparc: unify kernel/cpu	2008-12-07 00:04:30 -08:00
stacktrace.h
starfire.h
stat.h	sparc: unify stat.h	2009-01-02 18:48:21 -08:00
statfs.h
string_32.h
string_64.h
string.h
sunbpp.h
swab.h	sparc: introduce asm/swab.h	2009-01-06 18:10:27 -08:00
swift.h
syscall.h
syscalls.h
sysen.h
system_32.h	sparc,leon: Introduce the sparc-leon CPU type.	2009-08-17 18:32:10 -07:00
system_64.h	sparc64: Provide extern decls for sparc_??u_type strings.	2009-09-10 05:55:17 -07:00
system.h
termbits.h	sparc: Fix tty compile warnings.	2008-11-12 23:51:54 -08:00
termios.h
thread_info_32.h	sched: INIT_PREEMPT_COUNT	2009-07-10 14:24:05 -07:00
thread_info_64.h	sched: INIT_PREEMPT_COUNT	2009-07-10 14:24:05 -07:00
thread_info.h
timer_32.h
timer_64.h	sparc64: Use unsigned long long for u64.	2009-01-06 13:19:28 -08:00
timer.h
timex_32.h
timex_64.h
timex.h
tlb_32.h
tlb_64.h	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	2009-07-27 12:10:38 -07:00
tlb.h
tlbflush_32.h
tlbflush_64.h
tlbflush.h
topology_32.h
topology_64.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2009-03-30 18:46:12 -07:00
topology.h
trap_block.h	sparc64: Store per-cpu offset in trap_block[]	2009-06-16 04:56:11 -07:00
traps.h	sparc: drop get_tbr() in traps.h	2009-01-02 21:33:05 -08:00
tsb.h	sparc64: Stop using memory barriers for atomics and locks.	2008-12-04 09:16:47 -08:00
tsunami.h
ttable.h	sparc64: Make special trap return path for TRAP_NMI().	2008-12-04 09:17:03 -08:00
turbosparc.h
types.h	SPARC: fix duplicate declaration	2009-08-16 18:25:00 -07:00
uaccess_32.h	module: trim exception table on init free.	2009-06-12 21:47:04 +09:30
uaccess_64.h	sparc64: cheaper asm/uaccess.h inclusion	2009-08-16 18:25:53 -07:00
uaccess.h
uctx.h
unaligned.h
unistd.h	sparc: add basic support for 'perf'	2009-09-04 02:56:22 -07:00
upa.h
user.h
utrap.h
vac-ops.h
vaddrs.h
vga.h
viking.h
vio.h
visasm.h
watchdog.h
winmacro.h
xor_32.h
xor_64.h
xor.h