diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-18 01:54:41 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-18 01:54:41 +0200 |
commit | 01a7143586f51f80e1b29ebf240c6e5390657450 (patch) | |
tree | 3c07d62911d6a0901cc3d4795b90132401b2b8bb /net/ipv4/af_inet.c | |
parent | Merge branch '3.1-rc-fixes' of git://linux-iscsi.org/target-pending (diff) | |
parent | firewire: ohci: add no MSI quirk for O2Micro controller (diff) | |
download | linux-01a7143586f51f80e1b29ebf240c6e5390657450.tar.xz linux-01a7143586f51f80e1b29ebf240c6e5390657450.zip |
Merge branch 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394
* 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394:
firewire: ohci: add no MSI quirk for O2Micro controller
Diffstat (limited to 'net/ipv4/af_inet.c')
0 files changed, 0 insertions, 0 deletions