summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-23 01:27:05 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-23 01:27:05 -0800
commit675c60706cd197219c6e3e6e3f195475d842344e (patch)
tree8af8d2457e6674f01c6f3c3e144b8a391801a1eb /drivers/ata
parent662a96bd6f020782dfbdc0d0bd177c7dbb556687 (diff)
parenta120e912eb51e347f36c71b60a1d13af74d30e83 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions