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	xtensa: reorganize SR referencing	2012-10-15 21:48:08 -07:00
configs	xtensa: drop CONFIG_EMBEDDED_RAMDISK	2012-10-03 15:13:09 -07:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
kernel	xtensa: switch to generic sys_execve()	2012-10-25 15:00:44 -07:00
lib	xtensa: fix memmove(), bcopy(), and memcpy().	2012-10-15 21:41:19 -07:00
mm	xtensa: fix missing return in do_page_fault for SIGBUS case	2012-10-15 21:42:52 -07:00
platforms	xtensa: reorganize SR referencing	2012-10-15 21:48:08 -07:00
variants	xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer	2012-05-17 22:47:41 +02:00
Kconfig	xtensa: switch to generic kernel_execve()	2012-10-25 15:00:36 -07:00
Kconfig.debug
Makefile	xtensa: Setup CROSS_COMPILE at the top	2012-10-04 12:16:20 -07:00