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
..
vdso32	powerpc: Enable GCOV	2009-08-20 10:29:28 +10:00
vdso64	powerpc: Enable GCOV	2009-08-20 10:29:28 +10:00
.gitignore
align.c	powerpc: Keep track of emulated instructions	2009-05-21 15:44:26 +10:00
asm-offsets.c	Merge commit 'paulus-perf/master' into next	2009-08-20 11:07:56 +10:00
audit.c
btext.c
cacheinfo.c	powerpc/cacheinfo: Rename cache_dir per-cpu variable	2009-01-13 14:48:02 +11:00
cacheinfo.h
clock.c
compat_audit.c
cpu_setup_6xx.S	powerpc: Use names rather than numbers for SPRGs (v2)	2009-08-20 10:12:27 +10:00
cpu_setup_44x.S	AMCC PPC 460SX redwood SoC platform initial framework	2009-02-14 14:41:29 -05:00
cpu_setup_fsl_booke.S	powerpc/fsl-booke: Enable L1 cache on e500v1/e500v2/e500mc CPUs	2009-06-15 21:45:30 -05:00
cpu_setup_pa6t.S
cpu_setup_ppc970.S
cputable.c	powerpc/book3e-64: Move the default cpu table entry	2009-08-28 14:24:13 +10:00
crash.c
crash_dump.c	powerpc: Unify opcode definitions and support	2009-02-23 10:48:56 +11:00
dbell.c	powerpc: Add support for using doorbells for SMP IPI	2009-02-23 15:53:03 +11:00
dma-iommu.c	powerpc: use dma_map_ops struct	2009-08-28 14:24:10 +10:00
dma-swiotlb.c	powerpc: Handle SWIOTLB mapping error properly	2009-08-28 14:24:11 +10:00
dma.c	powerpc: Add CONFIG_DMA_API_DEBUG support	2009-08-28 14:24:11 +10:00
entry_32.S	powerpc: Use names rather than numbers for SPRGs (v2)	2009-08-20 10:12:27 +10:00
entry_64.S	powerpc: Remaining 64-bit Book3E support	2009-08-20 10:25:11 +10:00
exceptions-64e.S	powerpc/book3e-64: Add support to initial_tlb_book3e for non-HES TLB	2009-08-28 14:24:14 +10:00
exceptions-64s.S	Merge commit 'paulus-perf/master' into next	2009-08-20 11:07:56 +10:00
firmware.c
fpu.S	powerpc: Use names rather than numbers for SPRGs (v2)	2009-08-20 10:12:27 +10:00
ftrace.c	Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-20 10:56:46 -07:00
head_8xx.S	powerpc: Use names rather than numbers for SPRGs (v2)	2009-08-20 10:12:27 +10:00
head_32.S	powerpc: Use names rather than numbers for SPRGs (v2)	2009-08-20 10:12:27 +10:00
head_40x.S	powerpc: Use names rather than numbers for SPRGs (v2)	2009-08-20 10:12:27 +10:00
head_44x.S	powerpc/mm: Cleanup handling of execute permission	2009-08-27 13:12:51 +10:00
head_64.S	powerpc: Remaining 64-bit Book3E support	2009-08-20 10:25:11 +10:00
head_booke.h	powerpc: Use names rather than numbers for SPRGs (v2)	2009-08-20 10:12:27 +10:00
head_fsl_booke.S	powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT	2009-09-02 16:20:41 +10:00
ibmebus.c	powerpc: use dma_map_ops struct	2009-08-28 14:24:10 +10:00
idle.c
idle_6xx.S
idle_e500.S
idle_power4.S
init_task.c	mm: consolidate init_mm definition	2009-06-16 19:47:28 -07:00
io.c
iomap.c
iommu.c	powerpc: Change u64/s64 to a long long integer type	2009-01-13 14:47:59 +11:00
irq.c	Merge commit 'origin/master' into next	2009-06-12 16:53:38 +10:00
isa-bridge.c
kgdb.c
kprobes.c
l2cr_6xx.S
legacy_serial.c
lparcfg.c	powerpc/pseries: Fix to handle slb resize across migration	2009-09-02 16:19:01 +10:00
machine_kexec.c	powerpc: Allow mem=x cmdline to work with 4G+	2009-05-15 16:43:41 +10:00
machine_kexec_32.c
machine_kexec_64.c
Makefile	powerpc/pci: move pci_64.c device tree scanning code into pci-common.c	2009-08-28 14:24:15 +10:00
misc.S
misc_32.S	powerpc: Fix __flush_icache_range on 44x	2009-08-27 13:12:52 +10:00
misc_64.S	powerpc: Move VMX and VSX asm code to vector.S	2009-06-09 16:46:25 +10:00
module.c	module: cleanup FIXME comments about trimming exception table entries.	2009-06-12 21:47:05 +09:30
module_32.c
module_64.c	powerpc: Unify opcode definitions and support	2009-02-23 10:48:56 +11:00
mpc7450-pmu.c	perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it	2009-08-06 13:55:09 +02:00
msi.c	powerpc/PCI: include pci.h in powerpc MSI implementation	2009-03-25 08:54:29 -07:00
nvram_64.c
of_device.c	powerpc/of: Fix usage of dev_set_name() in of_device_alloc()	2009-06-26 16:55:35 +10:00
of_platform.c	powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()	2009-09-02 15:45:53 +10:00
paca.c	powerpc: Add PACA fields specific to 64-bit Book3E processors	2009-08-20 10:25:08 +10:00
pci-common.c	powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()	2009-09-02 15:45:53 +10:00
pci_32.c	powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()	2009-09-02 15:45:53 +10:00
pci_64.c	PCI/powerpc: support PCIe fundamental reset	2009-09-09 13:29:41 -07:00
pci_dn.c	powerpc/pci: Move pseries code into pseries platform specific area	2009-05-21 15:44:24 +10:00
pci_of_scan.c	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
perf_callchain.c	perf_counter: powerpc: Add callchain support	2009-08-18 14:48:47 +10:00
perf_counter.c	powerpc/perf_counters: Reduce stack usage of power_check_constraints	2009-09-11 11:27:59 +10:00
pmc.c
power4-pmu.c	perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it	2009-08-06 13:55:09 +02:00
power5+-pmu.c	perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it	2009-08-06 13:55:09 +02:00
power5-pmu.c	perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it	2009-08-06 13:55:09 +02:00
power6-pmu.c	perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it	2009-08-06 13:55:09 +02:00
power7-pmu.c	perf_counter/powerpc: Fix cache event codes for POWER7	2009-09-03 08:41:53 +02:00
ppc32.h
ppc970-pmu.c	perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it	2009-08-06 13:55:09 +02:00
ppc_ksyms.c
ppc_save_regs.S
proc_ppc64.c
process.c	powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead	2009-09-11 11:27:59 +10:00
prom.c	powerpc: Shield code specific to 64-bit server processors	2009-06-09 16:47:38 +10:00
prom_init.c	powerpc/prom_init: Evaluate mem kernel parameter for early allocation	2009-08-20 10:29:25 +10:00
prom_init_check.sh	powerpc: Print linux_banner in prom_init	2009-03-11 17:11:33 +11:00
prom_parse.c	powerpc: Fix of_node_put() exit path in of_irq_map_one()	2009-04-20 12:18:43 -06:00
ptrace.c	powerpc: Fix booke user_disable_single_step()	2009-07-15 17:41:45 +10:00
ptrace32.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
reloc_64.S
rtas-proc.c
rtas-rtc.c
rtas.c	powerpc/pseries: Fix to handle slb resize across migration	2009-09-02 16:19:01 +10:00
rtas_flash.c	proc 2/2: remove struct proc_dir_entry::owner	2009-03-31 01:14:44 +04:00
rtas_pci.c	powerpc/pci: Clean up direct access to sysdata by RTAS	2009-05-21 15:44:23 +10:00
setup-common.c	powerpc: Remove duplicated #include's	2009-04-07 15:18:58 +10:00
setup.h
setup_32.c	powerpc/nvram: Enable use Generic NVRAM driver for different size chips	2009-09-11 16:02:11 +10:00
setup_64.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-09-15 09:51:09 -07:00
signal.c	powerpc: Sanitize stack pointer in signal handling code	2009-03-27 16:58:24 +11:00
signal.h	powerpc: Sanitize stack pointer in signal handling code	2009-03-27 16:58:24 +11:00
signal_32.c	powerpc: Sanitize stack pointer in signal handling code	2009-03-27 16:58:24 +11:00
signal_64.c	powerpc: Sanitize stack pointer in signal handling code	2009-03-27 16:58:24 +11:00
smp-tbsync.c
smp.c	powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops	2009-09-11 11:27:57 +10:00
softemu8xx.c
stacktrace.c
suspend.c
swsusp.c
swsusp_32.S
swsusp_64.c
swsusp_asm64.S
sys_ppc32.c	powerpc: Add compat_sys_truncate	2009-08-20 10:12:34 +10:00
syscalls.c
sysfs.c	powerpc: Fix bug where perf_counters breaks oprofile	2009-09-11 11:27:58 +10:00
systbl.S
systbl_chk.c
systbl_chk.sh
tau_6xx.c
time.c	powerpc: Properly start decrementer on BookE secondary CPUs	2009-08-28 14:25:04 +10:00
traps.c	powerpc: Add PTRACE_SINGLEBLOCK support	2009-06-09 13:29:25 +10:00
udbg.c	powerpc/udbg: Fix lost byte during console handover; change LFCR to CRLF	2009-03-11 17:11:34 +11:00
udbg_16550.c	powerpc/440: Fix warning early debug code	2009-06-26 16:55:35 +10:00
vdso.c	powerpc: Move 64bit VDSO to improve context switch performance	2009-08-20 10:12:24 +10:00
vecemu.c
vector.S	powerpc: Use names rather than numbers for SPRGs (v2)	2009-08-20 10:12:27 +10:00
vio.c	powerpc: use dma_map_ops struct	2009-08-28 14:24:10 +10:00
vmlinux.lds.S	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-09-15 09:51:09 -07:00