diff options
author | 2008-12-09 08:27:57 -0800 | |
---|---|---|
committer | 2008-12-09 08:27:57 -0800 | |
commit | 6f8e5850df8eecee212c84831030b04f025c11ac (patch) | |
tree | 20f61ff763e83830993e18cfb726c18964622661 /net/unix/af_unix.c | |
parent | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
parent | ata: Fix experimental tags (diff) | |
download | linux-dev-6f8e5850df8eecee212c84831030b04f025c11ac.tar.xz linux-dev-6f8e5850df8eecee212c84831030b04f025c11ac.zip |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata: Fix experimental tags
pata_ninja32: update ID table
pata_sis: Remove bogus cable match
ATA: piix, fix pointer deref on suspend
pata_hpt366: fix clock detection
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions