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

..

configs

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

hpux

vfs: define struct filename and have getname() return it

2012-10-12 20:14:55 -04:00

include

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

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

kernel

vfs: define struct filename and have getname() return it

2012-10-12 20:14:55 -04:00

lib

[PARISC] update parisc to use generic strncpy_from_user()

2012-05-31 11:14:37 +01:00

math-emu

bug.h: add include of it to various implicit C users

2012-02-29 17:15:08 -05:00

mm

parisc: Use generic init_task

2012-05-05 13:00:24 +02:00

oprofile

oprofile: more whitespace fixes

2008-10-15 20:55:51 +02:00

defpalo.conf

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

install.sh

kbuild: use INSTALLKERNEL to select customized installkernel script

2009-09-20 12:18:14 +02: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

parisc: add strict copy size checks (v2)

2010-03-06 22:54:09 +00:00

Makefile

[PARISC] fix code to find libgcc

2012-06-05 14:10:23 +09:00

nm

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00