Linus Torvalds 22cdbd1d57 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: (108 commits) ehea: Fixing statistics bonding: Fix lockdep warning after bond_vlan_rx_register() tunnels: Fix tunnels change rcu protection caif-u5500: Build config for CAIF shared mem driver caif-u5500: CAIF shared memory mailbox interface caif-u5500: CAIF shared memory transport protocol caif-u5500: Adding shared memory include drivers/isdn: delete double assignment drivers/net/typhoon.c: delete double assignment drivers/net/sb1000.c: delete double assignment qlcnic: define valid vlan id range qlcnic: reduce rx ring size qlcnic: fix mac learning ehea: fix use after free inetpeer: __rcu annotations fib_rules: __rcu annotates ctarget tunnels: add __rcu annotations net: add __rcu annotations to protocol ipv4: add __rcu annotations to routes.c qlge: bugfix: Restoring the vlan setting. ...		2010-10-27 18:28:00 -07:00
..
9p	9p: client code cleanup	2010-10-21 04:26:39 -07:00
802	net/802: add __rcu annotations	2010-10-25 13:09:44 -07:00
8021q	vlan: rcu annotations	2010-10-25 13:09:43 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
ax25	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
bridge	bridge: Forward reserved group addresses if !STP	2010-10-21 04:25:48 -07:00
caif	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-06 19:39:31 -07:00
can	can-raw: add msg_flags to distinguish local traffic	2010-10-21 04:27:03 -07:00
ceph	ceph: fix num_pages_free accounting in pagelist	2010-10-20 15:38:23 -07:00
core	fib_rules: __rcu annotates ctarget	2010-10-27 11:37:32 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
decnet	net dst: use a percpu_counter to track entries	2010-10-11 13:06:53 -07:00
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	net: return operator cleanup	2010-09-23 14:33:39 -07:00
ethernet	net: return operator cleanup	2010-09-23 14:33:39 -07:00
ieee802154	ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc	2010-05-23 23:11:07 -07:00
ipv4	tunnels: Fix tunnels change rcu protection	2010-10-27 14:20:08 -07:00
ipv6	tunnels: Fix tunnels change rcu protection	2010-10-27 14:20:08 -07:00
ipx	BKL: introduce CONFIG_BKL.	2010-10-21 15:44:13 +02:00
irda	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
iucv	[S390] cleanup lowcore access from external interrupts	2010-10-25 16:10:19 +02:00
key	net: return operator cleanup	2010-09-23 14:33:39 -07:00
l2tp	l2tp: static functions should not be exported	2010-10-24 22:26:41 -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	net/llc: storing negative error codes in unsigned short	2010-09-16 22:38:23 -07:00
mac80211	mac80211: Fix ibss station got expired immediately	2010-10-25 14:45:56 -04:00
netfilter	netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and xt_TPROXY	2010-10-25 13:58:36 -07:00
netlabel	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
netlink	netlink: fix netlink_change_ngroups()	2010-10-24 16:25:39 -07:00
netrom	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
packet	net: simplify flags for tx timestamping	2010-08-19 00:08:30 -07:00
phonet	phonet: remove the unused variable pn	2010-10-20 01:55:54 -07:00
rds	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
rfkill	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
rose	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
rxrpc	Add a dummy printk function for the maintenance of unused printks	2010-08-12 09:51:35 -07:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
sunrpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2010-10-26 17:58:44 -07:00
tipc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
unix	fs: allow for more than 2^31 files	2010-10-26 16:52:15 -07:00
wanrouter	fix printk typo 'faild'	2010-08-09 11:25:17 +02: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: fix regression on processing country IEs	2010-10-25 14:43:14 -04:00
x25	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
xfrm	xfrm: make xfrm_bundle_ok local	2010-10-21 03:09:46 -07:00
Kconfig	ceph: factor out libceph from Ceph file system	2010-10-20 15:37:28 -07:00
Makefile	ceph: factor out libceph from Ceph file system	2010-10-20 15:37:28 -07:00
TUNABLE	…
compat.c	From abbffa2aa9bd6f8df16d0d0a102af677510d8b9a Mon Sep 17 00:00:00 2001	2010-06-03 20:03:40 -07:00
nonet.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
socket.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2010-10-26 17:58:44 -07:00
sysctl_net.c	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00