diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-23 21:35:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-23 21:35:04 +0100 |
| commit | 8be7cdccacfbfc707e7370cad9bb168defed636f (patch) | |
| tree | 8416607b62ec352176c81afd6f4e7b571ceb957f /drivers/ata/sata_promise.h | |
| parent | sunqe: Convert to net_device_ops. (diff) | |
| parent | ucc_geth: Fix oops when using fixed-link support (diff) | |
| download | linux-8be7cdccacfbfc707e7370cad9bb168defed636f.tar.xz linux-8be7cdccacfbfc707e7370cad9bb168defed636f.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ucc_geth.c
Diffstat (limited to 'drivers/ata/sata_promise.h')
0 files changed, 0 insertions, 0 deletions