| commit | eedc765ca4b19a41cf0b921a492ac08d640060d1 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Jun 06 17:42:02 2010 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sun Jun 06 17:42:02 2010 -0700 |
| tree | 95c566c6238cc953e1e336115d2daafe8bcb388f | |
| parent | e59d44df46edaafb6b637e98d046775524b31104 [diff] | |
| parent | 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/sfc/net_driver.h drivers/net/sfc/siena.c