History log of /linux/arch/powerpc/include/asm/pgalloc.h (Results 251 – 275 of 292)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 418f19ea 31-Dec-2008 Pierre Ossman <drzeus@drzeus.cx>

Merge branch 'master' of ../mmc


# a9de18eb 31-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/include/asm/pda.h
kernel/fork.c


# 33edcf13 29-Dec-2008 Rusty Russell <rusty@rustcorp.com.au>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 75329f1f 29-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/cleanups


# 0f01f07f 29-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branches 'tracing/docs', 'tracing/function-graph-tracer' and 'linus' into tracing/core


# 0ce74d92 29-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into timers/hrtimers

Conflicts:
sound/drivers/pcsp/pcsp.c

Semantic conflict:

sound/core/hrtimer.c


# e1df9576 29-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into perfcounters/core

Conflicts:
fs/exec.c
include/linux/init_task.h

Simple context conflicts.


# 0a8c5395 29-Dec-2008 Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>

[XFS] Fix merge failures

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.

[XFS] Fix merge failures

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_vnodeops.h

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

show more ...


# e3c6d4ee 29-Dec-2008 David S. Miller <davem@davemloft.net>

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/sparc64/kernel/idprom.c


# 3c92ec8a 29-Dec-2008 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (144 commits)
powerpc/44x: Support 16K

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (144 commits)
powerpc/44x: Support 16K/64K base page sizes on 44x
powerpc: Force memory size to be a multiple of PAGE_SIZE
powerpc/32: Wire up the trampoline code for kdump
powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
powerpc/32: Setup OF properties for kdump
powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
powerpc: Prepare xmon_save_regs for use with kdump
powerpc: Remove default kexec/crash_kernel ops assignments
powerpc: Make default kexec/crash_kernel ops implicit
powerpc: Setup OF properties for ppc32 kexec
powerpc/pseries: Fix cpu hotplug
powerpc: Fix KVM build on ppc440
powerpc/cell: add QPACE as a separate Cell platform
powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
powerpc/mpc5200: fix error paths in PSC UART probe function
powerpc/mpc5200: add rts/cts handling in PSC UART driver
powerpc/mpc5200: Make PSC UART driver update serial errors counters
powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
...

Fix trivial conflict in drivers/char/Makefile as per Paul's directions

show more ...


Revision tags: v2.6.28, v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7, v2.6.28-rc6
# 0186f47e 19-Nov-2008 Kumar Gala <galak@kernel.crashing.org>

powerpc: Use RCU based pte freeing mechanism for all powerpc

Refactor the RCU based pte free code that was used on ppc64 to be used
on all powerpc.

Additionally refactor pte_free() & pte_free_kerne

powerpc: Use RCU based pte freeing mechanism for all powerpc

Refactor the RCU based pte free code that was used on ppc64 to be used
on all powerpc.

Additionally refactor pte_free() & pte_free_kernel() into common code
between ppc32 & ppc64.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

show more ...


Revision tags: v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3
# 7a9787e1 28-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks


Revision tags: v2.6.28-rc2, v2.6.28-rc1
# b2aaf8f7 15-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h


# accba5f3 13-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into oprofile-v2

Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h


Revision tags: v2.6.27, v2.6.27-rc9
# f68ec0c2 03-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc8' into x86/setup


# d6d5aeb6 02-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc8' into genirq


Revision tags: v2.6.27-rc8
# e6aa0f07 24-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc7' into x86/microcode


# ebdd90a8 24-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc7' into x86/pebs


# 0b88641f 22-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc7' into x86/debug


Revision tags: v2.6.27-rc7
# 83bd6998 14-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc6' into timers/hpet


Revision tags: v2.6.27-rc6, v2.6.27-rc5
# 86d68898 28-Aug-2008 James Morris <jmorris@namei.org>

Merge branch 'master' into next


# 470fba7e 21-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/doc


Revision tags: v2.6.27-rc4
# 170465ee 20-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/xen


# 2879a927 19-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'x86/oprofile' into oprofile


# f3efbe58 15-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/gart


1...<<1112