| commit | d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Nov 08 23:00:54 2009 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Sun Nov 08 23:00:54 2009 -0800 |
| tree | daab7cc0db83226672f76d2fc9277e4355f89e6b | |
| parent | 9e0d57fd6dad37d72a3ca6db00ca8c76f2215454 [diff] | |
| parent | 2606289779cb297320a185db5997729d29b6700b [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/can/usb/ems_usb.c