summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_pdc2027x.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-23 21:35:04 +0100
committerDavid S. Miller <davem@davemloft.net>2009-03-23 21:35:04 +0100
commit8be7cdccacfbfc707e7370cad9bb168defed636f (patch)
tree8416607b62ec352176c81afd6f4e7b571ceb957f /drivers/ata/pata_pdc2027x.c
parentsunqe: Convert to net_device_ops. (diff)
parentucc_geth: Fix oops when using fixed-link support (diff)
downloadlinux-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/pata_pdc2027x.c')
0 files changed, 0 insertions, 0 deletions