Dmitry Torokhov 95d465fd75 Manual merge with Linus. ...

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c

2006-04-02 00:08:05 -05:00

..

vdso32

[PATCH] Mark unwind info for signal trampolines in vDSOs

2006-03-31 12:18:52 -08:00

vdso64

[PATCH] Mark unwind info for signal trampolines in vDSOs

2006-03-31 12:18:52 -08:00

align.c

…

asm-offsets.c

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

binfmt_elf32.c

…

btext.c

…

cpu_setup_6xx.S

powerpc: Move cpu_setup_6xx.S and temp.c over to arch/powerpc

2006-03-27 19:15:26 +11:00

cpu_setup_power4.S

[PATCH] powerpc: Cleanup LOADADDR etc. asm macros

2006-01-13 21:16:23 +11:00

cputable.c

Merge ../linux-2.6

2006-03-09 14:32:05 +11:00

crash_dump.c

[PATCH] Don't pass boot parameters to argv_init[]

2006-03-31 12:18:53 -08:00

crash.c

[PATCH] powerpc: Trivial fix to set the proper timeout value for kdump

2006-02-24 11:36:21 +11:00

dma_64.c

…

entry_32.S

powerpc: Unify the 32 and 64 bit idle loops

2006-03-27 15:03:03 +11:00

entry_64.S

[PATCH] powerpc: Workaround for pSeries RTAS bug

2006-03-28 16:45:33 +11:00

firmware.c

[PATCH] powerpc: Rename and export ppc64_firmware_features

2006-03-28 16:45:20 +11:00

fpu.S

powerpc/64: Fix bug in setting floating-point exception mode

2006-02-07 13:55:30 +11:00

head_4xx.S

…

head_8xx.S

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

head_32.S

[PATCH] powerpc: fix altivec_unavailable_exception Oopses

2006-02-24 11:36:23 +11:00

head_44x.S

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

head_64.S

[PATCH] powerpc: Allow non zero boot cpuids

2006-03-27 14:48:48 +11:00

head_booke.h

[PATCH] powerpc: Fix Kernel FP unavail exception for BookE

2006-02-10 16:51:50 +11:00

head_fsl_booke.S

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

ibmebus.c

…

idle_6xx.S

powerpc: Fix goof in 6xx and POWER4 idle power-save functions

2006-03-28 09:28:14 +11:00

idle_power4.S

powerpc: Fix goof in 6xx and POWER4 idle power-save functions

2006-03-28 09:28:14 +11:00

idle.c

powerpc: Unify the 32 and 64 bit idle loops

2006-03-27 15:03:03 +11:00

init_task.c

…

iomap.c

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

iommu.c

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

irq.c

[PATCH] for_each_possible_cpu: powerpc

2006-03-29 13:44:15 +11:00

kprobes.c

[PATCH] kprobes: fix broken fault handling for powerpc64

2006-03-26 08:57:04 -08:00

l2cr_6xx.S

powerpc: Move l2cr.S over to arch/powerpc

2006-03-27 15:22:28 +11:00

legacy_serial.c

[PATCH] powerpc: legacy_serial loop cleanup

2006-03-27 14:48:54 +11:00

lparcfg.c

[PATCH] for_each_possible_cpu: powerpc

2006-03-29 13:44:15 +11:00

lparmap.c

…

machine_kexec_32.c

…

machine_kexec_64.c

[PATCH] powerpc: Only calculate htab_size in one place for kexec

2006-02-24 11:36:18 +11:00

machine_kexec.c

…

Makefile

powerpc: Move perfmon_fsl_booke.c over to arch/powerpc

2006-03-27 20:09:04 +11:00

misc_32.S

[PATCH] powerpc: Cleanup LOADADDR etc. asm macros

2006-01-13 21:16:23 +11:00

misc_64.S

[PATCH] powerpc: Cleanup LOADADDR etc. asm macros

2006-01-13 21:16:23 +11:00

module_32.c

powerpc: Move module.c over to arch/powerpc

2006-03-27 19:28:58 +11:00

module_64.c

…

nvram_64.c

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

of_device.c

[PATCH] powerpc: tidy-up of_register_driver()/driver_register() return values

2006-03-23 14:40:54 +11:00

paca.c

[PATCH] powerpc: Allow non zero boot cpuids

2006-03-27 14:48:48 +11:00

pci_32.c

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

pci_64.c

[PATCH] powerpc: make ISA floppies work again

2006-03-28 16:45:36 +11:00

pci_direct_iommu.c

…

pci_dn.c

…

pci_iommu.c

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

perfmon_fsl_booke.c

powerpc: Move perfmon_fsl_booke.c over to arch/powerpc

2006-03-27 20:09:04 +11:00

pmc.c

…

ppc32.h

…

ppc_ksyms.c

Merge ../linux-2.6

2006-03-17 12:01:19 +11:00

proc_ppc64.c

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

process.c

[PATCH] unexport get_wchan

2006-03-31 12:19:01 -08:00

prom_init.c

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

prom_parse.c

[PATCH] powerpc: add refcounting to setup_peg2 and of_get_pci_address

2006-02-07 21:32:45 +11:00

prom.c

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

ptrace32.c

…

ptrace-common.h

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

ptrace.c

powerpc: Fix various syscall/signal/swapcontext bugs

2006-03-08 13:24:22 +11:00

rtas_flash.c

[PATCH] Don't check pointer for NULL before passing it to kfree [arch/powerpc/kernel/rtas_flash.c]

2006-02-07 21:51:53 +11:00

rtas_pci.c

Merge ../linux-2.6

2006-03-17 12:01:19 +11:00

rtas-proc.c

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

rtas-rtc.c

[PATCH] powerpc: RTC memory corruption

2006-03-16 16:55:03 +11:00

rtas.c

[PATCH] for_each_possible_cpu: powerpc

2006-03-29 13:44:15 +11:00

semaphore.c

…

setup_32.c

[PATCH] for_each_possible_cpu: powerpc

2006-03-29 13:44:15 +11:00

setup_64.c

[PATCH] for_each_possible_cpu: powerpc

2006-03-29 13:44:15 +11:00

setup-common.c

Manual merge with Linus.

2006-04-02 00:08:05 -05:00

setup.h

…

signal_32.c

[PATCH] powerpc: declare arch syscalls in <asm/syscalls.h>

2006-03-27 14:48:22 +11:00

signal_64.c

[PATCH] powerpc: fix incorrect SA_ONSTACK behaviour for 64-bit processes

2006-03-28 16:45:24 +11:00

smp-tbsync.c

…

smp.c

[PATCH] for_each_possible_cpu: powerpc

2006-03-29 13:44:15 +11:00

swsusp_32.S

powerpc: Move swsusp.S over to arch/powerpc

2006-03-27 19:21:46 +11:00

sys_ppc32.c

[PATCH] consolidate sys32/compat_adjtimex

2006-03-26 08:56:57 -08:00

syscalls.c

[PATCH] powerpc: declare arch syscalls in <asm/syscalls.h>

2006-03-27 14:48:22 +11:00

sysfs.c

[PATCH] for_each_possible_cpu: powerpc

2006-03-29 13:44:15 +11:00

systbl.S

powerpc: Fix various syscall/signal/swapcontext bugs

2006-03-08 13:24:22 +11:00

tau_6xx.c

powerpc: Move cpu_setup_6xx.S and temp.c over to arch/powerpc

2006-03-27 19:15:26 +11:00

time.c

[PATCH] for_each_possible_cpu: powerpc

2006-03-29 13:44:15 +11:00

traps.c

Merge ../linux-2.6

2006-03-29 13:24:50 +11:00

udbg_16550.c

[PATCH] powerpc: fix compile warning in udbg_init_maple_realmode

2006-02-07 21:51:52 +11:00

udbg.c

…

vdso.c

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00

vecemu.c

…

vector.S

…

vio.c

[PATCH] Add vio_bus_type probe and remove methods

2006-01-13 11:26:07 -08:00

vmlinux.lds.S

[PATCH] powerpc: Kill _machine and hard-coded platform numbers

2006-03-28 23:15:54 +11:00