David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-11-10 18:32:51 -05:00

..

boot

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

2012-10-06 03:16:12 +09:00

configs

UAPI Disintegration 2012-10-09

2012-10-09 15:04:25 +01:00

include

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-10 18:32:51 -05:00

kernel

cpuidle/powerpc: Fix smt_snooze_delay functionality.

2012-10-18 10:57:24 +11:00

kvm

powerpc: Build fix for powerpc KVM

2012-10-18 10:37:52 +11:00

lib

powerpc: Fix VMX fix for memcpy case

2012-10-04 18:02:43 +10:00

math-emu

…

mm

readahead: fault retry breaks mmap file read random detection

2012-10-09 16:22:47 +09:00

net

powerpc: Start using ___PPC_RA/B/S/T where necessary

2012-07-10 19:18:25 +10:00

oprofile

mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file

2012-10-09 16:22:18 +09:00

perf

Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events"

2012-10-18 10:36:11 +11:00

platforms

cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.

2012-10-18 10:57:25 +11:00

sysdev

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

2012-10-06 03:16:12 +09:00

xmon

powerpc: Add an xmon command to dump one or all pacas

2012-09-18 15:02:36 +10:00

Kconfig

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

Kconfig.debug

powerpc: IOMMU fault injection

2012-07-10 19:18:59 +10:00

Makefile

crypto: nx - move nx build to driver/crypto Makefile

2012-06-27 14:42:00 +08:00

relocs_check.pl

powerpc: Process dynamic relocations for kernel

2011-12-20 10:21:08 -05:00