Linus Torvalds f6cec0ae58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (59 commits) igbvf.txt: Add igbvf Documentation igb.txt: Add igb documentation e100/e1000*/igb*/ixgb*: Add missing read memory barrier ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG netxen: protect tx timeout recovery by rtnl lock isdn: gigaset: use after free isdn: gigaset: add missing unlock solos-pci: Fix race condition in tasklet RX handling pkt_sched: Fix sch_sfq vs tcf_bind_filter oops net: disable preemption before call smp_processor_id() tcp: no md5sig option size check bug iwlwifi: fix locking assertions iwlwifi: fix TX tracer isdn: fix information leak net: Fix napi_gro_frags vs netpoll path usbnet: remove noisy and hardly useful printk rtl8180: avoid potential NULL deref in rtl8180_beacon_work ath9k: Remove myself from the MAINTAINERS list libertas: scan before assocation if no BSSID was given libertas: fix association with some APs by using extended rates ...		2010-08-09 21:05:52 -07:00
..
9p	fs/9p: destroy fid on failed remove	2010-08-02 14:28:36 -05: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	vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)	2010-07-18 15:38:44 -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	ppp: make channel_ops const	2010-08-04 21:53:17 -07:00
ax25	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
bluetooth	Bluetooth: Check result code of L2CAP information response	2010-08-04 07:25:17 -07:00
bridge	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-02 22:22:46 -07:00
caif	caif: precedence bug	2010-07-22 14:14:47 -07:00
can	can-raw: Fix skb_orphan_try handling	2010-08-03 00:31:48 -07:00
core	net: disable preemption before call smp_processor_id()	2010-08-07 20:35:43 -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: dccp: fix sign bug	2010-07-18 15:07:14 -07:00
decnet	net-next: remove useless union keyword	2010-06-10 23:31:35 -07:00
dns_resolver	[DNS RESOLVER] Minor typo correction	2010-08-06 03:18:09 +00:00
dsa	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-20 18:25:24 -07:00
econet	econet: fix locking	2010-06-11 18:37:08 -07:00
ethernet	Net: ethernet: pe2.c: fix EXPORT_SYMBOL macro code style issue	2010-07-14 18:27:09 -07:00
ieee802154	ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc	2010-05-23 23:11:07 -07:00
ipv4	tcp: no md5sig option size check bug	2010-08-07 20:24:28 -07:00
ipv6	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -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	ppp: make channel_ops const	2010-08-04 21:53:17 -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	ppp: make channel_ops const	2010-08-04 21:53:17 -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	mac80211: Fix compilation warning when CONFIG_INET is not set	2010-08-04 15:28:37 -04:00
netfilter	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
netlabel	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
netlink	genetlink: use genl_register_family_with_ops()	2010-07-26 21:00:10 -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	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-20 18:25:24 -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/rose: Use GFP_ATOMIC	2010-08-01 00:32:12 -07:00
rxrpc	RxRPC: Fix a potential deadlock between the call resend_timer and state_lock	2010-08-04 21:53:16 -07:00
sched	pkt_sched: Fix sch_sfq vs tcf_bind_filter oops	2010-08-07 22:45:41 -07:00
sctp	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
sunrpc	Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux	2010-08-07 14:24:41 -07:00
tipc	tipc: Reduce footprint by un-inlining tipc_msg_* routines	2010-05-12 23:02:29 -07:00
unix	drop_monitor: convert some kfree_skb call sites to consume_skb	2010-07-20 13:28:05 -07:00
wanrouter	net: autoconvert trivial BKL users to private mutex	2010-07-12 20:21:47 -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: Update of regulatory request initiator handling	2010-07-28 16:24:01 -04:00
x25	X25: Remove bkl in sockopts	2010-05-17 17:39:28 -07:00
xfrm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-20 18:25:24 -07:00
compat.c	From abbffa2aa9bd6f8df16d0d0a102af677510d8b9a Mon Sep 17 00:00:00 2001	2010-06-03 20:03:40 -07:00
Kconfig	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
Makefile	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
nonet.c
socket.c	net: support time stamping in phy devices.	2010-07-18 19:15:26 -07:00
sysctl_net.c	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
TUNABLE