android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_kernel_samsung_sm8650/net
History
David S. Miller 6b08f51624 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	drivers/net/ixgbe/ixgbe_ethtool.c

With merge conflict help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2010-06-14 22:59:34 -07:00
..
9p
kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN
2010-05-25 08:07:02 -07:00
802
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-04-11 14:53:53 -07:00
8021q
net: Enable 64-bit net device statistics on 32-bit architectures
2010-06-12 15:51:22 -07:00
appletalk
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-04-11 14:53:53 -07:00
atm
net-next: remove useless union keyword
2010-06-10 23:31:35 -07:00
ax25
net: sk_sleep() helper
2010-04-20 16:37:13 -07:00
bluetooth
net: use __packed annotation
2010-06-03 03:21:52 -07:00
bridge
net-next: remove useless union keyword
2010-06-10 23:31:35 -07:00
caif
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-06-11 13:32:31 -07:00
can
net/can: Use memdup_user
2010-05-31 00:24:11 -07:00
core
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-06-14 22:59:34 -07:00
dcb
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
dccp
net-next: remove useless union keyword
2010-06-10 23:31:35 -07:00
decnet
net-next: remove useless union keyword
2010-06-10 23:31:35 -07:00
dsa
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-04-11 14:53:53 -07:00
econet
econet: fix locking
2010-06-11 18:37:08 -07:00
ethernet
net-next: remove useless union keyword
2010-06-10 23:31:35 -07:00
ieee802154
ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc
2010-05-23 23:11:07 -07:00
ipv4
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-06-11 13:32:31 -07:00
ipv6
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-06-11 13:32:31 -07:00
ipx
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
irda
irttp: Print device parameters and statistics as unsigned
2010-06-12 18:18:33 -07:00
iucv
net: use __packed annotation
2010-06-03 03:21:52 -07:00
key
pfkey: add severity to printk
2010-05-17 23:23:13 -07:00
l2tp
net-next: remove useless union keyword
2010-06-10 23:31:35 -07:00
lapb
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
llc
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-05-12 00:05:35 -07:00
mac80211
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-06-11 13:32:31 -07:00
netfilter
pkt_sched: gen_kill_estimator() rcu fixes
2010-06-11 18:37:08 -07:00
netlabel
net: Remove unnecessary returns from void function()s
2010-05-17 23:23:14 -07:00
netlink
netlink: Implment netlink_broadcast_filtered
2010-05-21 09:37:32 -07:00
netrom
net: sk_sleep() helper
2010-04-20 16:37:13 -07:00
packet
packet_mmap: expose hw packet timestamps to network packet capture utilities
2010-06-02 05:53:56 -07:00
phonet
phonet: use call_rcu for phonet device free
2010-06-09 16:14:25 -07:00
rds
net/rds: Add missing mutex_unlock
2010-05-29 00:18:48 -07:00
rfkill
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-04-11 14:53:53 -07:00
rose
net: sk_sleep() helper
2010-04-20 16:37:13 -07:00
rxrpc
net-next: remove useless union keyword
2010-06-10 23:31:35 -07:00
sched
pkt_sched: gen_kill_estimator() rcu fixes
2010-06-11 18:37:08 -07:00
sctp
net-next: remove useless union keyword
2010-06-10 23:31:35 -07:00
sunrpc
sunrpc: fix leak on error on socket xprt setup
2010-05-26 08:43:50 -04:00
tipc
tipc: Reduce footprint by un-inlining tipc_msg_* routines
2010-05-12 23:02:29 -07:00
unix
unix/garbage: kill copy of the skb queue walker
2010-05-03 15:39:58 -07:00
wanrouter
headers: smp_lock.h redux
2009-07-12 12:22:34 -07:00
wimax
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-05-20 21:04:44 -07:00
wireless
cfg80211: make action channel type optional
2010-06-02 16:13:27 -04:00
x25
X25: Remove bkl in sockopts
2010-05-17 17:39:28 -07:00
xfrm
net: check for refcount if pop a stacked dst_entry
2010-06-04 15:56:00 -07:00
compat.c
From abbffa2aa9bd6f8df16d0d0a102af677510d8b9a Mon Sep 17 00:00:00 2001
2010-06-03 20:03:40 -07:00
Kconfig
net/sysfs: Fix the bitrot in network device kobject namespace support
2010-05-21 09:37:32 -07:00
Makefile
l2tp: Split pppol2tp patch into separate l2tp and ppp parts
2010-04-03 14:56:02 -07:00
nonet.c
…
socket.c
From abbffa2aa9bd6f8df16d0d0a102af677510d8b9a Mon Sep 17 00:00:00 2001
2010-06-03 20:03:40 -07:00
sysctl_net.c
net: Remove unnecessary returns from void function()s
2010-05-17 23:23:14 -07:00
TUNABLE
…