diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 16:16:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 16:16:49 -0500 |
| commit | 6d04e3b04b6ab569cabeb5ca28ad1be11777e895 (patch) | |
| tree | aaee636d71492f36fdef9977488c85a64063f8c4 /drivers/ieee1394/ohci1394.h | |
| parent | 42270035c6550101f7dc742a630c2590dd2d3ae0 (diff) | |
| parent | 5c15bdec5c38f4ccf73ef2585fc80a6164de9554 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[VLAN]: Avoid a 4-order allocation.
[HDLC] Fix dev->header_cache_update having a random value.
[NetLabel]: Verify sensitivity level has a valid CIPSO mapping
[PPPOE]: Key connections properly on local device.
[AF_UNIX]: Test against sk_max_ack_backlog properly.
[NET]: Fix bugs in "Whether sock accept queue is full" checking
Diffstat (limited to 'drivers/ieee1394/ohci1394.h')
0 files changed, 0 insertions, 0 deletions