Linus Torvalds 2f2c779583 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: (30 commits) ctcm: rename READ/WRITE defines to avoid redefinitions claw: rename READ/WRITE defines to avoid redefinitions phylib: available for any speed ethernet can: add limit for nframes and clean up signed/unsigned variables pkt_sched: Check .walk and .leaf class handlers pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops caif-spi: Bugfix SPI_DATA_POS settings were inverted. caif: Bugfix - Increase default headroom size for control channel. net: make netpoll_rx return bool for !CONFIG_NETPOLL Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM Bluetooth: Change default L2CAP ERTM retransmit timeout Bluetooth: Fix endianness issue with L2CAP MPS configuration net: Use NET_XMIT_SUCCESS where possible. isdn: mISDN: call pci_disable_device() if pci_probe() failed isdn: avm: call pci_disable_device() if pci_probe() failed isdn: avm: call pci_disable_device() if pci_probe() failed usbnet: rx_submit() should return an error code. pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles ...		2010-08-13 10:38:12 -07:00
..
9p	fs/9p: destroy fid on failed remove	2010-08-02 14:28:36 -05:00
802
8021q	vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)	2010-07-18 15:38:44 -07:00
appletalk
atm	ppp: make channel_ops const	2010-08-04 21:53:17 -07:00
ax25
bluetooth	Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM	2010-08-10 07:59:11 -04: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: Bugfix - Increase default headroom size for control channel.	2010-08-10 16:39:27 -07:00
can	can: add limit for nframes and clean up signed/unsigned variables	2010-08-11 16:12:35 -07:00
core	net: disable preemption before call smp_processor_id()	2010-08-07 20:35:43 -07:00
dcb
dccp	net: dccp: fix sign bug	2010-07-18 15:07:14 -07:00
decnet
dns_resolver	DNS: If the DNS server returns an error, allow that to be cached [ver #2]	2010-08-11 17:11:28 +00:00
dsa	phylib: available for any speed ethernet	2010-08-11 23:03:50 -07:00
econet
ethernet	Net: ethernet: pe2.c: fix EXPORT_SYMBOL macro code style issue	2010-07-14 18:27:09 -07:00
ieee802154
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
irda	ppp: make channel_ops const	2010-08-04 21:53:17 -07:00
iucv
key
l2tp	ppp: make channel_ops const	2010-08-04 21:53:17 -07:00
lapb
llc
mac80211	param: simple locking for sysfs-writable charp parameters	2010-08-11 23:04:31 +09:30
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
netlink	genetlink: use genl_register_family_with_ops()	2010-07-26 21:00:10 -07:00
netrom
packet
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
rfkill
rose	net/rose: Use GFP_ATOMIC	2010-08-01 00:32:12 -07:00
rxrpc	Add a dummy printk function for the maintenance of unused printks	2010-08-12 09:51:35 -07:00
sched	pkt_sched: Check .walk and .leaf class handlers	2010-08-11 01:37:00 -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	nfs: update for module_param_named API change	2010-08-11 23:04:15 +09:30
tipc
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
wireless	cfg80211: fix locking in action frame TX	2010-08-09 15:18:57 -04:00
x25
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
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
TUNABLE