David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net ...

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

2011-09-22 03:23:13 -04:00

..

boot

Merge branch 'master' of github.com:davem330/net

2011-09-22 03:23:13 -04:00

configs

Merge branch 'master' of github.com:davem330/net

2011-09-22 03:23:13 -04:00

include/asm

remove remaining references to nfsservctl

2011-08-29 16:31:59 -07:00

kernel

powerpc: Really fix build without CONFIG_PCI

2011-08-11 01:15:44 +10:00

kvm

powerpc/kvm: Fix build errors with older toolchains

2011-08-05 14:47:56 +10:00

lib

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2011-05-20 13:28:01 -07:00

math-emu

powerpc/85xx: Fix SPE float to integer conversion failure

2011-03-15 13:48:15 -05:00

mm

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

2011-07-25 22:59:39 -07:00

net

net: filter: BPF 'JIT' compiler for PPC64

2011-07-21 12:38:32 -07:00

oprofile

powerpc/oprofile: Handle events that raise an exception without overflowing

2011-05-26 13:38:57 +10:00

platforms

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

2011-08-20 10:39:12 -07:00

sysdev

arch/powerpc/sysdev/fsl_rio.c: correct IECSR register clear value

2011-08-25 18:51:06 -07:00

xmon

powerpc: Remove call sites of MSG_ALL_BUT_SELF

2011-05-19 14:30:46 +10:00

Kconfig

flexcan: Add flexcan device support for p1010rdb.

2011-08-17 20:36:38 -07:00

Kconfig.debug

powerpc/pseries: Re-implement HVSI as part of hvc_vio

2011-06-29 17:48:35 +10:00

Makefile

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

2011-07-25 22:59:39 -07:00

relocs_check.pl

powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE

2009-09-24 15:31:40 +10:00