| commit | da935c66bacb3ed9ada984b053297f87c2dff63a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Feb 19 19:17:35 2011 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Sat Feb 19 19:17:35 2011 -0800 |
| tree | 46278da2b312c73f1375b830d7e5912bf23abd78 | |
| parent | 9435eb1cf0b76b323019cebf8d16762a50a12a19 [diff] | |
| parent | 2205a6ea93fea76f88b43727fea53f3ce3790d6f [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: Documentation/feature-removal-schedule.txt drivers/net/e1000e/netdev.c net/xfrm/xfrm_policy.c