diff options
| author | Linus Torvalds <[email protected]> | 2008-10-27 18:41:51 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-10-27 18:41:51 +0000 |
| commit | 49fdf6785fd660e18a1eb4588928f47e9fa29a9a (patch) | |
| tree | 71cccf385d734bfc33e9cd4752b5046aef99c130 /net/unix/af_unix.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | libata: fix NCQ devices behind port multipliers (diff) | |
| download | kernel-49fdf6785fd660e18a1eb4588928f47e9fa29a9a.tar.gz kernel-49fdf6785fd660e18a1eb4588928f47e9fa29a9a.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
libata: fix NCQ devices behind port multipliers
scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions