David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/sfc/rx.c Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change the rx_buf->is_page boolean into a set of u16 flags, and another to adjust how ->ip_summed is initialized. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-02-26 21:55:51 -05:00
..
boot	powerpc/85xx: Add dr_mode property in USB nodes	2012-01-18 08:05:42 -06:00
configs	powerpc: Remove legacy iSeries from ppc64_defconfig	2012-02-16 16:15:08 +11:00
include/asm	net: Add framework to allow sending packets with customized CRC.	2012-02-24 01:37:35 -08:00
kernel	powerpc: Fix various issues with return to userspace	2012-02-22 16:48:53 +11:00
kvm	Merge branch 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-01-10 09:57:11 -08:00
lib	powerpc: POWER7 optimised copy_to_user/copy_from_user using VMX	2011-12-19 14:40:40 +11:00
math-emu	powerpc/math_emu/efp: Look for errata handler when type mismatches	2011-10-06 23:36:47 -05:00
mm	cpumask: update setup_node_to_cpumask_map() comments	2012-01-12 20:13:11 -08: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	powerpc: Remove references to cpu_*_map	2012-02-22 16:48:47 +11:00
sysdev	powerpc/fsl/pci: Fix PCIe fixup regression	2012-02-16 16:15:03 +11:00
xmon	powerpc/xmon: Fix #if typo for systems without MSR[RI]	2011-11-25 14:11:28 +11:00
Kconfig	lib: use generic pci_iomap on all architectures	2012-01-10 18:04:27 -08:00
Kconfig.debug	powerpc: Implement CONFIG_STRICT_DEVMEM	2011-11-28 11:42:08 +11:00
Makefile	powerpc: Process dynamic relocations for kernel	2011-12-20 10:21:08 -05:00
relocs_check.pl	powerpc: Process dynamic relocations for kernel	2011-12-20 10:21:08 -05:00