Ingo Molnar 37bf06375c Merge tag 'v3.12-rc4' into sched/core ...

Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.

Conflicts:
	arch/avr32/include/asm/Kbuild

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2013-10-09 12:36:13 +02:00

..

9p

Merge tag 'for-linus-3.12-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

2013-09-11 12:34:13 -07:00

802

mrp: add periodictimer to allow retries when packets get lost

2013-09-23 16:53:52 -04:00

8021q

net: vlan: inherit addr_assign_type along with dev_addr

2013-09-03 20:57:49 -04:00

appletalk

net: proc_fs: trivial: print UIDs as unsigned int

2013-08-15 14:37:46 -07:00

atm

net: always pass struct netdev_notifier_info to netdevice notifiers

2013-05-28 21:58:54 -07:00

ax25

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

batman-adv

batman-adv: set the TAG flag for the vid passed to BLA

2013-09-17 21:15:16 +02:00

bluetooth

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

2013-09-27 13:11:17 -04:00

bridge

bridge: fix NULL pointer deref of br_port_get_rcu

2013-09-15 22:03:33 -04:00

caif

caif: Add missing braces to multiline if in cfctrl_linkup_request

2013-09-05 14:31:02 -04:00

can

can: gw: add a per rule limitation of frame hops

2013-08-29 22:58:24 +02:00

ceph

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2013-09-19 12:50:37 -05:00

core

net: flow_dissector: fix thoff for IPPROTO_AH

2013-09-30 15:32:05 -04:00

dcb

rtnetlink: Remove passing of attributes into rtnl_doit functions

2013-03-22 10:31:16 -04:00

dccp

net:dccp: do not report ICMP redirects to user space

2013-09-18 12:33:44 -04:00

decnet

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

dns_resolver

net: strict_strtoul is obsolete, use kstrtoul instead

2013-07-12 16:09:14 -07:00

dsa

net: dsa: inherit addr_assign_type along with dev_addr

2013-09-03 20:57:49 -04:00

ethernet

net: Fix sysfs_format_mac() code duplication.

2013-07-16 17:09:22 -07:00

ieee802154

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

2013-09-05 14:54:29 -07:00

ipv4

ip_tunnel: Remove double unregister of the fallback device

2013-10-01 12:42:16 -04:00

ipv6

ip6tnl: allow to use rtnl ops on fb tunnel

2013-10-01 12:55:53 -04:00

ipx

net: proc_fs: trivial: print UIDs as unsigned int

2013-08-15 14:37:46 -07:00

irda

sched/wait: Make the __wait_event*() interface more friendly

2013-10-04 10:16:25 +02:00

iucv

net: delete __cpuinit usage from all net files

2013-07-14 19:36:58 -04:00

key

xfrm: Remove rebundant address family checking

2013-08-07 10:12:58 +02:00

l2tp

l2tp: make datapath resilient to packet loss when sequence numbers enabled

2013-07-02 16:33:25 -07:00

lapb

net/lapb: re-send packets on timeout

2013-09-23 16:52:45 -04:00

llc

llc: Use normal etherdevice.h tests

2013-09-03 22:34:47 -04:00

mac80211

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-08-28 13:51:40 -04:00

mac802154

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

2013-04-30 03:55:20 -04:00

mpls

MPLS: Add limited GSO support

2013-05-27 22:50:59 -07:00

netfilter

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

netlabel

netlabel: use domain based selectors when address based selectors are not available

2013-08-02 16:57:01 -07:00

netlink

net: netlink: filter particular protocols from analyzers

2013-09-06 14:43:48 -04:00

netrom

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

nfc

NFC: Update secure element state

2013-08-14 01:13:40 +02:00

openvswitch

net: ovs: flow: fix potential illegal memory access in __parse_flow_nlattrs

2013-09-11 16:09:58 -04:00

packet

net: packet: use reciprocal_divide in fanout_demux_hash

2013-08-29 16:43:29 -04:00

phonet

net: proc_fs: trivial: print UIDs as unsigned int

2013-08-15 14:37:46 -07:00

rds

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

rfkill

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

2013-09-05 14:54:29 -07:00

rose

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

rxrpc

Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2013-02-21 12:05:51 -08:00

sched

pkt_sched: fq: rate limiting improvements

2013-10-01 13:00:38 -04:00

sctp

net: sctp: rfc4443: do not report ICMP redirects to user space

2013-09-16 21:40:15 -04:00

sunrpc

RPCSEC_GSS: fix crash on destroying gss auth

2013-09-18 10:18:44 -05:00

tipc

tipc: set sk_err correctly when connection fails

2013-08-30 16:06:57 -04:00

unix

af_unix: fix bug on large send()

2013-08-11 22:02:36 -07:00

vmw_vsock

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

2013-08-16 15:37:26 -07:00

wimax

…

wireless

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

2013-09-05 14:54:29 -07:00

x25

x25: add a sanity check parsing X.25 facilities

2013-09-04 00:27:27 -04:00

xfrm

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

2013-09-05 14:58:52 -04:00

compat.c

net: Unbreak compat_sys_{send,recv}msg

2013-06-06 11:52:14 -07:00

Kconfig

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

Makefile

MPLS: Add limited GSO support

2013-05-27 22:50:59 -07:00

nonet.c

…

socket.c

Merge git://git.kvack.org/~bcrl/aio-next

2013-09-13 10:55:58 -07:00

sysctl_net.c

net: Update the sysctl permissions handler to test effective uid/gid

2013-10-06 13:50:14 -07:00