diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-06 08:23:37 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-06 08:23:37 +0200 |
commit | e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4 (patch) | |
tree | 83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0 /drivers/ata/libata-eh.c | |
parent | b44: Use pr_<level>_once and DRV_DESCRIPTION (diff) | |
parent | net: vlan: enable soft features regardless of underlying device (diff) | |
download | linux-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.tar.xz linux-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/ata/libata-eh.c')
0 files changed, 0 insertions, 0 deletions