David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-04-01 13:36:50 -04:00

..

alpha

net: add option to enable error queue packets waking select

2013-03-31 19:44:20 -04:00

arc

ARC: Fix the typo in event identifier flags used by ptrace

2013-03-20 18:45:45 +05:30

arm

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

2013-03-27 13:52:49 -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

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

c6x

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-02-26 20:16:07 -08:00

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-02-26 20:16:07 -08:00

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

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

metag

metag: Inhibit NUMA balancing.

2013-03-04 10:29:19 +00:00

microblaze

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

mips

net: add option to enable error queue packets waking select

2013-03-31 19:44:20 -04:00

mn10300

net: add option to enable error queue packets waking select

2013-03-31 19:44:20 -04:00

openrisc

openrisc: remove HAVE_VIRT_TO_BUS

2013-03-13 06:12:39 +01:00

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

net: add option to enable error queue packets waking select

2013-03-31 19:44:20 -04:00

score

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

sh

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

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

um: Use tty_port in SIGWINCH handler

2013-03-11 10:08:04 +01:00

unicore32

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

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

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00