aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-15 17:05:58 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-15 17:05:58 -0700
commitfa04a008a16ac633a55f41baf9e84b551e613e7e (patch)
tree47d851bf415167751d3b8c20449fdd7a035f7220 /drivers/ide
parentd09c6b809432668371b5de9102f4f9aa6a7c79cc (diff)
parent16c61add51f2182140637c924687a2aab6b568f9 (diff)
downloadlinux-2.6.34-ux500-fa04a008a16ac633a55f41baf9e84b551e613e7e.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [RXRPC] net/rxrpc/ar-connection.c: fix NULL dereference [TCP]: Fix logic breakage due to DSACK separation [TCP]: Congestion control API RTT sampling fix
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions