David S. Miller b262e60309 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c

2008-10-01 06:12:56 -07:00

..

boot

powerpc: Holly board needs dtbImage target

2008-09-17 09:14:42 -07:00

configs

powerpc: Update defconfigs for most non-embedded platforms

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

include/asm

Fix compile failure with non modular builds

2008-09-17 09:14:42 -07:00

kernel

kgdb, x86, arm, mips, powerpc: ignore user space single stepping

2008-09-26 10:36:41 -05: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

powerpc/spufs: Fix possible scheduling of a context to multiple SPEs

2008-09-08 09:44:43 +10: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