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

Conflicts:

	include/asm-x86/statfs.h

2008-10-13 17:13:56 +01:00

..

boot

powerpc: Fix PCI in Holly device tree

2008-09-30 13:25:05 +10:00

configs

powerpc: Update defconfigs for most non-embedded platforms

2008-08-26 13:31:55 +10:00

include/asm

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

2008-10-13 17:13:56 +01:00

kernel

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

2008-10-13 17:13:56 +01:00

kvm

KVM: ppc: fix invalidation of large guest pages

2008-07-27 12:02:05 +03:00

lib

powerpc: Remove use of CONFIG_PPC_MERGE

2008-08-04 13:18:17 +10:00

math-emu

powerpc: Add macros to access floating point registers in thread_struct.

2008-07-01 11:28:43 +10:00

mm

powerpc: Only make kernel text pages of linear mapping executable

2008-09-03 20:53:22 +10:00

oprofile

on_each_cpu(): kill unused 'retry' parameter

2008-06-26 11:24:38 +02:00

platforms

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

2008-10-13 17:13:56 +01:00

sysdev

mv643xx_eth: remove force_phy_addr field

2008-09-05 06:33:59 +02:00

xmon

Merge branch 'linux-2.6'

2008-06-30 10:16:50 +10:00

Kconfig

mm: Make generic weak get_user_pages_fast and EXPORT_GPL it

2008-08-12 17:52:53 +10:00

Kconfig.debug

powerpc: Remove use of CONFIG_PPC_MERGE

2008-08-04 13:18:17 +10:00

Makefile

powerpc: Work around gcc's -fno-omit-frame-pointer bug

2008-09-03 20:53:34 +10:00