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-07-12 20:21:43 -07:00
2010-07-18 15:38:44 -07:00
2010-07-09 00:09:21 -07:00
2010-04-20 16:37:13 -07:00
2010-07-20 18:25:24 -07:00
2010-07-19 23:28:25 -07:00
2010-06-29 00:06:38 -07:00
2010-05-31 00:24:11 -07:00
2010-07-20 18:25:24 -07:00
2010-07-18 15:07:14 -07:00
2010-06-10 23:31:35 -07:00
2010-07-20 18:25:24 -07:00
2010-06-11 18:37:08 -07:00
2010-07-14 18:27:09 -07:00
2010-05-23 23:11:07 -07:00
2010-07-20 18:25:24 -07:00
2010-07-20 18:25:24 -07:00
2010-07-12 21:13:37 -07:00
2010-06-03 03:21:52 -07:00
2010-05-17 23:23:13 -07:00
2010-06-10 23:31:35 -07:00
2010-05-12 00:05:35 -07:00
2010-07-13 15:57:29 -04:00
2010-07-02 22:42:06 -07:00
2010-05-17 23:23:14 -07:00
2010-07-20 13:28:05 -07:00
2010-04-20 16:37:13 -07:00
2010-06-02 05:53:56 -07:00
2010-07-20 18:25:24 -07:00
2010-05-29 00:18:48 -07:00
2010-04-20 16:37:13 -07:00
2010-06-10 23:31:35 -07:00
2010-07-20 18:25:24 -07:00
2010-06-25 21:33:17 -07:00
2010-05-26 08:43:50 -04:00
2010-05-12 23:02:29 -07:00
2010-07-20 13:28:05 -07:00
2010-07-12 20:21:47 -07:00
2010-05-20 21:04:44 -07:00
2010-07-13 15:57:29 -04:00
2010-05-17 17:39:28 -07:00
2010-07-20 18:25:24 -07:00
2010-06-03 20:03:40 -07:00
2010-07-18 19:15:26 -07:00
2010-06-29 15:32:43 -07:00
2010-07-18 19:15:26 -07:00
2010-05-17 23:23:14 -07:00
11fe883936