linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-03-06 19:51:13 +00:00

History

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

Disintegrate asm/system.h for Alpha

2012-03-28 18:11:12 +01:00

include

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

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

kernel

alpha: separate thread-synchronous flags

2012-10-24 05:16:45 +03:00

lib

alpha: Use new generic strncpy_from_user() and strnlen_user()