tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
4fc8796d23819da814ec25b7793bde8f104f1a2a
ack-tegra/net
History
Trond Myklebust 8aa0a410af Merge commit 'nfs-for-3.3-4' into nfs-for-next 
Conflicts:
	fs/nfs/nfs4proc.c

Back-merge of the upstream kernel in order to fix a conflict with the
slotid type conversion and implementation id patches...
2012-03-03 15:05:56 -05:00
..
9p
virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf
2012-01-12 15:44:42 +10:30
802
…
8021q
…
appletalk
…
atm
…
ax25
ax25: avoid overflows in ax25_setsockopt()
2011-12-28 14:08:08 -05:00
batman-adv
…
bluetooth
bluetooth: hci: Fix type of "enable_hs" to bool.
2012-01-22 15:08:46 -05:00
bridge
bridge: BH already disabled in br_fdb_cleanup()
2012-01-17 10:17:32 -05:00
caif
net caif: Register properly as a pernet subsystem.
2012-01-27 21:06:03 -05:00
can
…
ceph
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-02-02 15:47:33 -08:00
core
net: RTNETLINK adjusting values of min_ifinfo_dump_size
2012-01-26 16:35:57 -05:00
dcb
…
dccp
inet_diag: Rename inet_diag_req into inet_diag_req_v2
2012-01-11 12:56:06 -08:00
decnet
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
dns_resolver
…
dsa
…
econet
…
ethernet
…
ieee802154
…
ipv4
tcp: fix tcp_trim_head() to adjust segment count with skb MSS
2012-01-30 12:42:58 -05:00
ipv6
tcp: md5: using remote adress for md5 lookup in rst packet
2012-01-22 15:08:45 -05:00
ipx
…
irda
irda: use msecs_to_jiffies() rather than manual calculation
2011-12-21 15:46:22 -05:00
iucv
af_iucv: get rid of state IUCV_SEVERED
2011-12-20 14:05:03 -05:00
key
…
l2tp
l2tp: l2tp_ip - fix possible oops on packet receive
2012-01-25 21:45:00 -05:00
lapb
…
llc
llc: Fix race condition in llc_ui_recvmsg
2012-01-24 15:33:19 -05:00
mac80211
mac80211: set bss_conf.idle when vif is connected
2012-01-24 14:47:09 -05:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-01-17 22:26:41 -08:00
netlabel
net: reintroduce missing rcu_assign_pointer() calls
2012-01-12 12:26:56 -08:00
netlink
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
netrom
netrom: avoid overflows in nr_setsockopt()
2011-12-28 14:08:08 -05:00
nfc
NFC: Export a new attribute nfcid1 in target info
2012-01-04 14:30:43 -05:00
openvswitch
openvswitch: Fix multipart datapath dumps.
2012-01-17 23:56:19 -05:00
packet
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-30 13:04:14 -05:00
phonet
net: reintroduce missing rcu_assign_pointer() calls
2012-01-12 12:26:56 -08:00
rds
rds: Make rds_sock_lock BH rather than IRQ safe.
2012-01-24 17:03:44 -05:00
rfkill
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2012-01-05 10:13:24 -05:00
rose
…
rxrpc
net: fix assignment of 0/1 to bool variables.
2011-12-19 22:27:29 -05:00
sched
netem: Fix off-by-one bug in reordering
2012-01-22 15:08:44 -05:00
sctp
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-01-08 13:21:22 -08:00
sunrpc
SUNRPC: Add API to acquire source address
2012-03-02 15:36:53 -05:00
tipc
tipc: rename struct bearer_name to struct tipc_bearer_names
2011-12-29 21:53:30 -05:00
unix
af_unix: fix EPOLLET regression for stream sockets
2012-01-30 12:45:07 -05:00
wanrouter
…
wimax
…
wireless
nl80211: fix old station flags compatibility
2012-01-11 15:14:50 -05:00
x25
net:x25: use IS_ENABLED
2011-12-16 15:49:52 -05:00
xfrm
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
compat.c
…
Kconfig
…
Makefile
…
nonet.c
…
socket.c
net: reintroduce missing rcu_assign_pointer() calls
2012-01-12 12:26:56 -08:00
sysctl_net.c
…