Linus Torvalds 72a73a69f6 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (28 commits) PCI: make arch/i386/pci/common.c:pci_bf_sort static PCI: ibmphp_pci.c: fix NULL dereference pciehp: remove unnecessary pci_disable_msi pciehp: remove unnecessary free_irq PCI: rpaphp: change device tree examination PCI: Change memory allocation for acpiphp slots i2c-i801: SMBus patch for Intel ICH9 PCI: irq: irq and pci_ids patch for Intel ICH9 PCI: pci_{enable,disable}_device() nestable ports PCI: switch pci_{enable,disable}_device() to be nestable PCI: arch/i386/kernel/pci-dma.c: ioremap balanced with iounmap pci/i386: style cleanups PCI: Block on access to temporarily unavailable pci device pci: fix __pci_register_driver error handling pci: clear osc support flags if no _OSC method acpiphp: fix missing acpiphp_glue_exit() acpiphp: fix use of list_for_each macro Altix: Initial ACPI support - ROM shadowing. Altix: SN ACPI hotplug support. Altix: Add initial ACPI IO support ...		2006-12-01 16:41:27 -08:00
..
iseries	[POWERPC] Fix up after irq changes	2006-10-07 22:08:26 +10:00
8253pit.h
a.out.h
abs_addr.h
agp.h
asm-compat.h	[POWERPC] Support feature fixups in vdso's	2006-10-25 11:54:07 +10:00
atomic.h
auxvec.h
backlight.h	[PATCH] powermac: More powermac backlight fixes	2006-07-31 13:28:45 -07:00
bitops.h
bootx.h
btext.h
bug.h	[PATCH] Let WARN_ON/WARN_ON_ONCE return the condition	2006-09-29 09:18:06 -07:00
bugs.h
byteorder.h
cache.h
cacheflush.h
checksum.h
compat.h
cputable.h	[POWERPC] Cell timebase bug workaround	2006-10-25 11:54:18 +10:00
cputime.h
current.h	[POWERPC] Make current preempt-safe	2006-11-01 14:52:48 +11:00
dbdma.h
delay.h
device.h	Driver core: add dev_archdata to struct device	2006-12-01 14:52:01 -08:00
div64.h
dma-mapping.h
dma.h
eeh_event.h
eeh.h	[POWERPC] Fix MMIO ops to provide expected barrier behaviour	2006-09-13 22:08:26 +10:00
elf.h
emergency-restart.h
errno.h
fcntl.h
firmware.h	[POWERPC] Support feature fixups in vdso's	2006-10-25 11:54:07 +10:00
floppy.h
fs_pd.h	POWERPC: Get rid of remapping the whole immr	2006-09-21 22:37:58 +04:00
futex.h	[POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic().	2006-09-13 18:28:41 +10:00
grackle.h
hardirq.h
heathrow.h
hvcall.h	[POWERPC] powerpc: Instrument Hypervisor Calls	2006-09-13 18:39:53 +10:00
hvconsole.h
hvcserver.h
hw_irq.h
i8259.h	[POWERPC] Fix CHRP platforms with only 8259	2006-10-25 13:49:22 +10:00
ibmebus.h	IRQ: Use the new typedef for interrupt handler function pointers	2006-10-09 12:19:47 +01:00
ide.h	[POWERPC] clean up ide io accessors	2006-09-20 14:06:18 +10:00
immap_86xx.h
immap_qe.h	[POWERPC] Add QUICC Engine (QE) infrastructure	2006-10-04 15:24:27 +10:00
io.h	[POWERPC] Make mmiowb's io_sync preempt safe	2006-11-01 14:52:49 +11:00
ioctl.h
ioctls.h
iommu.h	[POWERPC] Use 4kB iommu pages even on 64kB-page systems	2006-11-01 14:52:48 +11:00
ipc.h
ipcbuf.h
ipic.h	[POWERPC] Fix up after irq changes	2006-10-07 22:08:26 +10:00
irq_regs.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
irq.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
irqflags.h
Kbuild	[HEADERS] One line per header in Kbuild files to reduce conflicts	2006-09-19 12:43:58 +01:00
kdebug.h
kdump.h	[POWERPC] kdump: Support kernels having 64k page size.	2006-09-13 18:30:04 +10:00
kexec.h	[POWERPC] Make crash.c work on 32-bit and 64-bit	2006-08-17 16:41:10 +10:00
keylargo.h
kmap_types.h
kprobes.h	[PATCH] kprobes: handle symbol resolution when <module:.symbol> is specified	2006-10-02 07:57:16 -07:00
linkage.h
lmb.h
local.h
lppaca.h	[POWERPC] Update lppaca offset comments	2006-08-08 17:08:58 +10:00
machdep.h	[POWERPC] Fix up after irq changes	2006-10-07 22:08:26 +10:00
macio.h
mc146818rtc.h
mediabay.h
mman.h
mmu_context.h
mmu.h
mmzone.h
module.h
mpc85xx.h	POWERPC: Add support for the mpc8560 eval board	2006-09-21 22:31:26 +04:00
mpc86xx.h	[POWERPC] Use mpc8641hpcn PIC base address from dev tree.	2006-08-25 14:32:13 +10:00
mpic.h	[POWERPC] Fix up after irq changes	2006-10-07 22:08:26 +10:00
msgbuf.h
mutex.h
namei.h
nvram.h
of_device.h
ohare.h
oprofile_impl.h	[POWERPC] Fix oprofile support for e500 in arch/powerpc	2006-11-01 14:52:48 +11:00
paca.h	Merge branch 'linux-2.6'	2006-09-14 07:07:18 +10:00
page_32.h
page_64.h
page.h	[POWERPC] Remove DISCONTIGMEM cruft from page.h	2006-09-22 15:19:58 +10:00
param.h
parport.h
pci-bridge.h	Remove all inclusions of <linux/config.h>	2006-10-04 03:38:54 -04:00
pci.h	PCI: Replace HAVE_ARCH_PCI_MWI with PCI_DISABLE_MWI	2006-12-01 14:36:57 -08:00
percpu.h
pgalloc.h	[POWERPC] hugepage BUG fix	2006-08-24 10:07:23 +10:00
pgtable-4k.h	[PATCH] Standardize pxx_page macros	2006-09-26 08:48:51 -07:00
pgtable-64k.h
pgtable.h	[PATCH] Standardize pxx_page macros	2006-09-26 08:48:51 -07:00
pmac_feature.h
pmac_low_i2c.h
pmac_pfunc.h
pmc.h	[POWERPC] Fix oprofile support for e500 in arch/powerpc	2006-11-01 14:52:48 +11:00
poll.h
posix_types.h
ppc_asm.h	[POWERPC] Cell timebase bug workaround	2006-10-25 11:54:18 +10:00
ppc-pci.h	[POWERPC] EEH: enable MMIO/DMA on frozen slot	2006-09-21 22:59:14 +10:00
processor.h
prom.h	[POWERPC] Fix device_is_compatible() const warning	2006-10-25 11:54:24 +10:00
pSeries_reconfig.h
ptrace.h	[PATCH] Add regs_return_value() helper	2006-10-02 07:57:16 -07:00
qe_ic.h	[POWERPC] Add QUICC Engine (QE) infrastructure	2006-10-04 15:24:27 +10:00
qe.h	[POWERPC] Add QUICC Engine (QE) infrastructure	2006-10-04 15:24:27 +10:00
reg_8xx.h
reg.h	[POWERPC] Cell timebase bug workaround	2006-10-25 11:54:18 +10:00
resource.h
rtas.h	[POWERPC] Add a helper for calculating RTAS "config_addr" parameters	2006-08-25 13:27:35 +10:00
rtc.h
rwsem.h
scatterlist.h
seccomp.h
sections.h
semaphore.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
smu.h	[POWERPC] powermac: Constify & voidify get_property()	2006-07-31 15:55:05 +10:00
socket.h
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h	[PATCH] Directed yield: direct yield of spinlocks for powerpc	2006-10-01 00:39:22 -07:00
spu_csa.h
spu_priv1.h
spu.h	[POWERPC] spufs: add infrastructure for finding elf objects	2006-10-05 09:21:02 +10:00
sstep.h
stat.h
statfs.h
string.h
synch.h
syscalls.h
systbl.h	[POWERPC] Wire up sys_move_pages	2006-11-16 10:31:14 +11:00
system.h	[POWERPC] Fix rmb() for e500-based machines it	2006-11-01 14:52:48 +11:00
tce.h	[POWERPC] Use 4kB iommu pages even on 64kB-page systems	2006-11-01 14:52:48 +11:00
termbits.h
termios.h
thread_info.h
time.h	[POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"	2006-11-22 12:13:36 +11:00
timex.h	[POWERPC] Cell timebase bug workaround	2006-10-25 11:54:18 +10:00
tlb.h
tlbflush.h
todc.h
topology.h	[POWERPC] Add the thread_siblings files to sysfs	2006-11-16 10:31:14 +11:00
tsi108_irq.h	[POWERPC] Update mpc7448hpc2 board irq support using device tree	2006-08-23 15:51:18 +10:00
tsi108.h	[POWERPC] Update mpc7448hpc2 board irq support using device tree	2006-08-23 15:51:18 +10:00
types.h
uaccess.h
ucc_fast.h	[POWERPC] Add QUICC Engine (QE) infrastructure	2006-10-04 15:24:27 +10:00
ucc_slow.h	[POWERPC] Add QUICC Engine (QE) infrastructure	2006-10-04 15:24:27 +10:00
ucc.h	[POWERPC] Add QUICC Engine (QE) infrastructure	2006-10-04 15:24:27 +10:00
ucontext.h
udbg.h
unaligned.h
uninorth.h
unistd.h	[POWERPC] Wire up sys_move_pages	2006-11-16 10:31:14 +11:00
user.h
vdso_datapage.h
vdso.h
vga.h
vio.h
xmon.h	[POWERPC] Fix xmon=off and cleanup xmon initialisation	2006-10-04 14:52:22 +10:00
xor.h