original_kernel/arch
David S. Miller d978a6361a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/nfc/microread/mei.c
	net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-07 18:37:01 -04:00
..
alpha net: add option to enable error queue packets waking select 2013-03-31 19:44:20 -04:00
arc
arm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-07 18:37:01 -04:00
arm64 Fix IS_ENABLED() usage typo (missing CONFIG_ prefix). 2013-03-28 13:45:49 -07:00
avr32 net: add option to enable error queue packets waking select 2013-03-31 19:44:20 -04:00
blackfin
c6x
cris net: add option to enable error queue packets waking select 2013-03-31 19:44:20 -04:00
frv net: add option to enable error queue packets waking select 2013-03-31 19:44:20 -04:00
h8300 net: add option to enable error queue packets waking select 2013-03-31 19:44:20 -04:00
hexagon
ia64 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-01 13:36:50 -04:00
m32r net: add option to enable error queue packets waking select 2013-03-31 19:44:20 -04:00
m68k
metag
microblaze
mips Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-07 18:37:01 -04:00
mn10300 net: add option to enable error queue packets waking select 2013-03-31 19:44:20 -04:00
openrisc
parisc net: add option to enable error queue packets waking select 2013-03-31 19:44:20 -04:00
powerpc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-01 13:36:50 -04:00
s390 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-07 18:37:01 -04:00
score
sh
sparc net: add option to enable error queue packets waking select 2013-03-31 19:44:20 -04:00
tile Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 2013-04-01 08:17:09 -07:00
um
unicore32
x86 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-01 13:36:50 -04:00
xtensa net: add option to enable error queue packets waking select 2013-03-31 19:44:20 -04:00
.gitignore
Kconfig