aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/ata_piix.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-08-20 20:25:36 -0400
committerDavid S. Miller <davem@davemloft.net>2011-08-20 20:25:36 -0400
commitca1ba7caa68520864e4b9227e67f3bbc6fed373b (patch)
tree84010e15b506f0506c15dbf03794dd8b776074ea /drivers/ata/ata_piix.c
parent6461be3a54f802e00d5dcba3537271f92a90eaf3 (diff)
parent66f32a8b97f11ad73d2e7b8c192c55febb20b425 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next
Conflicts: drivers/net/ethernet/intel/e1000e/netdev.c
Diffstat (limited to 'drivers/ata/ata_piix.c')
0 files changed, 0 insertions, 0 deletions