aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/socket.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-31 13:45:06 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-31 13:45:06 -0400
commit7d9ef601ddf0a42d11df3bdaaf28078fd2995eab (patch)
treebb681d27103850e1882d375ddce04f18cf42d0c7 /net/sctp/socket.c
parent3b42d28b2a04b3c9830eb865288239d45eccc402 (diff)
parent2a3103ce4357a09c2289405f969acec0edf4398f (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] Bump driver versions ata_piix: implement IOCFG bit18 quirk libata: implement BROKEN_HPA horkage and apply it to affected drives sata_promise: FastTrack TX4200 is a second-generation chip pata_marvell: Add more identifiers ata_piix: add Satellite U200 to broken suspend list ata: add ATA_MWDMA* and ATA_SWDMA* defines ata_piix: IDE mode SATA patch for Intel Tolapai libata-core: Allow translation setting to fail
Diffstat (limited to 'net/sctp/socket.c')
0 files changed, 0 insertions, 0 deletions