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	FRV: Don't objcopy the GNU build_id note	2012-11-02 13:20:42 +00:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
kernel	frv: fix the broken preempt	2012-11-02 12:08:25 -04:00
lib
mb93090-mb00	FRV: Add missing linux/export.h #inclusions	2012-11-02 13:20:42 +00:00
mm	frv: remove the second parameter of kmap_atomic_primary()	2012-07-23 14:11:22 +08:00
defconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Kconfig	frv: switch to saner kernel_execve() semantics	2012-11-02 12:05:04 -04:00
Kconfig.debug
Makefile	frv: Use generic init_task	2012-05-05 13:00:23 +02:00