David S. Miller 11fe883936 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>
2010-07-20 18:25:24 -07:00
..
2010-06-03 03:18:23 -07:00
2010-07-19 13:34:16 -07:00
2010-07-08 23:12:27 -07:00
2010-07-15 20:27:57 -07:00
2010-07-19 20:23:38 -07:00
2010-05-10 05:01:31 -07:00
2010-07-14 17:55:35 -07:00
2010-07-20 13:24:25 -07:00
2010-07-18 14:51:59 -07:00
2010-07-12 21:21:27 -07:00
2010-07-15 20:46:23 -07:00
2009-09-01 01:13:50 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-06-03 03:18:23 -07:00
2010-07-19 15:27:13 -07:00
2010-07-11 18:15:08 -07:00
2010-05-10 05:01:31 -07:00
2010-07-11 18:15:08 -07:00
2010-05-10 05:01:31 -07:00
2010-07-08 23:42:40 -07:00
2010-07-07 18:24:29 -07:00
2009-04-04 16:51:14 -07:00
2010-07-19 20:30:07 -07:00
2009-08-12 23:03:00 -07:00
2010-02-17 13:35:44 -08:00
2010-02-17 13:35:44 -08:00
2009-11-05 20:00:29 -08:00
2010-07-07 15:45:00 -07:00
2010-04-23 00:10:52 -07:00
2010-07-14 13:36:18 -07:00
2010-02-26 02:10:14 -08:00
2010-06-25 20:37:21 -07:00
2010-06-25 20:37:20 -07:00
2010-07-19 13:32:57 -07:00
2010-07-14 13:40:36 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-06-03 03:18:23 -07:00
2009-11-11 19:22:21 -08:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-05-17 22:47:34 -07:00
2010-07-14 17:57:19 -07:00
2010-07-05 22:15:47 -07:00
2009-01-06 10:47:44 -08:00
2010-05-10 05:01:31 -07:00
2010-05-17 22:47:34 -07:00
2010-03-18 21:14:00 -07:00
2010-07-19 13:32:57 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-06-21 13:40:25 -07:00
2010-07-05 20:08:05 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-04-22 15:48:17 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-07-15 20:46:22 -07:00
2010-07-15 20:46:22 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-06-03 03:18:23 -07:00
2010-05-17 22:47:34 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-07-14 12:17:35 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-06-03 03:18:23 -07:00
2010-07-11 17:07:43 -07:00
2010-05-10 05:01:31 -07:00
2010-04-14 16:11:33 -07:00
2010-06-03 03:18:23 -07:00
2010-06-03 03:18:23 -07:00
2010-05-10 05:01:31 -07:00
2010-05-10 05:01:31 -07:00
2010-07-14 17:53:18 -07:00