David S. Miller b53c47dd4f Included changes: ... - fix recently introduced output behaviour -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJRBtWEAAoJEADl0hg6qKeO5P0P/1SvRNUjavJkZp5G7Yb/HhEQ 66rwst3tC6Bo0d7jpi0IX/EQd9KpQNPqmq/DzDiwPtNEYEA2obI8fKeUMvT6wXR+ +tdviD0biz7tzKoy8kFlRv2eQEs7ibvjsmdOaqoiFzfBfdDJjxmME6iFuyyNbbU1 3Yvb81lUpnT2+kw3vG5+yjvwlzrBal9Jwigeah3ok0TkzdvRmrU92TSt6KGhRvyx r6E2q8PA7pQvSPgRWjGW+8hye/6XzTsqe+zCT7yOe/LT+epMjn5rrgEzRdUvjzFS RGjAIMW82Cqn00h6PtacjOVecL3RjyfAmDamvPym8/6x2FxbfR00zkSPX/AX6F8T pxq4QhmMWP4YDYG8oHL1N2PUMqMODmhuDivrBfqTSpQO7h7KMZ0T4LHBXRoSuWSy W46/QuO/xazQzgoAZlO/CDM2ZNMAee6ol2wvN30uX9JmLb+12OTjD/7Isn4LP5oO rdJXhELwxd5oowo+NDXVIq0YmXjMNO9iukMhURBMNKXr/U+i0N9O124ba9p8ahFM voI19Iflhtl2nzMP4WsycNaaLVKVAalhV8hAu4y75aOA7Z6PwqcIHv4aSjOWwJmb 2jhH+PKyvddyJaduWLCYcAqvDZ8Gj2fVl9yf9uFcWJKgO3BbrNN69eOdOtLoCHkO ixJSGwm8lvUnXc0jOThJ =os3V -----END PGP SIGNATURE----- Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Included changes: - fix recently introduced output behaviour Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-29 15:59:45 -05:00
..
9p	virtio: 9p: correctly pass physical address to userspace for high pages	2012-10-22 18:19:36 +10:30
802
8021q	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
appletalk	userns: Print out socket uids in a user namespace aware fashion.	2012-08-14 21:48:06 -07:00
atm	atm: use scnprintf() instead of sprintf()	2012-12-17 20:50:51 -08:00
ax25	userns: Convert net/ax25 to use kuid_t where appropriate	2012-08-14 21:49:42 -07:00
batman-adv	Included changes:	2013-01-29 15:59:45 -05:00
bluetooth	Bluetooth: Check if the hci connection exists in SCO shutdown	2013-01-10 03:53:32 -02:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
caif	caif_usb: Make the driver name check more efficient	2012-12-09 00:34:02 -05:00
can	can: rework skb reserved data handling	2013-01-28 18:17:25 -05:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2013-01-02 17:32:49 -08:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-29 15:32:13 -05:00
dcb	net: Allow DCBnl to use other namespaces besides init_net	2012-12-10 14:09:01 -05:00
dccp	inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock	2012-12-14 13:14:07 -05:00
decnet	decnet: use correct RCU API to deref sk_dst_cache field	2013-01-28 00:15:27 -05:00
dns_resolver	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-12-16 15:40:50 -08:00
dsa	dsa: make dsa_switch_setup check for valid port names	2013-01-21 15:40:12 -05:00
ethernet	net: split eth_mac_addr for better error handling	2013-01-21 14:07:44 -05:00
ieee802154	6lowpan: Handle uncompressed IPv6 packets over 6LoWPAN	2013-01-18 14:18:30 -05:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-29 15:32:13 -05:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-29 15:32:13 -05:00
ipx	userns: Print out socket uids in a user namespace aware fashion.	2012-08-14 21:48:06 -07:00
irda	irda: buffer overflow in irnet_ctrl_read()	2013-01-27 20:38:19 -05:00
iucv	s390/irq: remove split irq fields from /proc/stat	2013-01-08 10:57:07 +01:00
key	net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm	2012-11-18 20:32:45 -05:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
lapb
llc	net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm	2012-11-18 20:32:45 -05:00
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-01-28 13:54:03 -05:00
mac802154	mac802154: fix NOHZ local_softirq_pending 08 warning	2013-01-04 13:47:21 -08:00
netfilter	netfilter: nf_conntrack: fix compilation if sysctl are disabled	2013-01-23 15:14:31 +01:00
netlabel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-10-02 13:38:27 -07:00
netlink	netlink: Use FIELD_SIZEOF() in netlink_proto_init().	2013-01-09 23:38:23 -08:00
netrom	net: change return values from -EACCES to -EPERM	2012-09-21 13:58:08 -04:00
nfc	NFC: Use skb_copy_datagram_iovec	2013-01-11 14:56:32 +01:00
openvswitch	openvswitch: Use FIELD_SIZEOF() in dp_init().	2013-01-09 23:38:24 -08:00
packet	net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm	2012-11-18 20:32:45 -05:00
phonet	net: Push capable(CAP_NET_ADMIN) into the rtnl methods	2012-11-18 20:32:44 -05:00
rds	IB/rds: suppress incompatible protocol when version is known	2012-12-26 15:17:37 -08:00
rfkill	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
rose
rxrpc	rxrpc: Use FIELD_SIZEOF() in af_rxrpc_init().	2013-01-09 23:38:24 -08:00
sched	pkt_sched: namespace aware act_mirred	2013-01-14 15:09:36 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-29 15:32:13 -05:00
sunrpc	NFS client bugfixe for Linux 3.8	2013-01-11 12:09:04 -08:00
tipc	tipc: refactor accept() code for improved readability	2012-12-07 17:23:24 -05:00
unix	unix: Use FIELD_SIZEOF() in af_unix_init().	2013-01-09 23:38:24 -08:00
wanrouter	wanmain: comparing array with NULL	2012-07-24 13:55:21 -07:00
wimax
wireless	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-01-28 14:43:00 -05:00
x25	net: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:45 -07:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-29 15:32:13 -05:00
compat.c	make get_file() return its argument	2012-09-26 21:10:25 -04:00
Kconfig	net: Add support for XPS without sysfs being defined	2013-01-10 22:47:04 -08:00
Makefile	ipv6: Preserve ipv6 functionality needed by NET	2012-11-18 02:34:00 -05:00
nonet.c
socket.c	cgroup: net_cls: Rework update socket logic	2012-10-26 03:40:51 -04:00
sysctl_net.c	user_ns: get rid of duplicate code in net_ctl_permissions	2012-11-18 20:32:45 -05:00