diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 12:49:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 12:49:10 -0500 |
| commit | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (patch) | |
| tree | 89505069cd4f46253c649bcd418a9e3cd26fc55f /net/socket.c | |
| parent | 7a62b17694e278b1cde659f85aa6149052baa811 (diff) | |
| parent | 25a41b280083259d05d68f61633194344a1f8a9f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: add quirk fix for Freecom HDD
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions