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
..
appldata	s390/vtimer: rework virtual timer interface	2012-07-20 11:15:08 +02:00
boot	s390: fix linker script for 31 bit builds	2012-10-18 17:50:10 +02:00
crypto	crypto: arch/s390 - cleanup - remove unneeded cra_list initialization	2012-08-01 17:47:29 +08:00
hypfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-10-02 20:25:04 -07:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
kernel	s390/cache: fix data/instruction cache output	2012-10-18 17:50:11 +02:00
kvm	KVM updates for the 3.7 merge window	2012-10-04 09:30:33 -07:00
lib	s390/string: provide asm lib functions for memcpy and memcmp	2012-09-26 15:44:50 +02:00
math-emu	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
mm	s390/mm,vmem: fix vmem_add_mem()/vmem_remove_range()	2012-10-09 14:17:01 +02:00
net	s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction	2012-09-26 15:45:28 +02:00
oprofile	oprofile, s390: Fix uninitialized memory access when writing to oprofilefs	2012-08-27 14:49:23 +02:00
defconfig	s390: update defconfig	2012-09-26 15:45:29 +02:00
Kbuild	s390/bpf,jit: BPF Just In Time compiler for s390	2012-09-26 15:44:49 +02:00
Kconfig	s390/thp: select HAVE_ARCH_TRANSPARENT_HUGEPAGE	2012-10-18 17:50:10 +02:00
Kconfig.debug	s390/mm: add page table dumper	2012-10-09 14:16:58 +02:00
Makefile	s390: Use generic init_task	2012-05-05 13:00:25 +02:00