| commit | 3752aee96538b582b089f4a97a26e2ccd9403929 | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Wed, 20 Sep 2006 03:36:22 +0000 (19 20:36 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Wed, 20 Sep 2006 03:36:22 +0000 (19 20:36 -0700) | ||
| tree | 162601df617d057d1c56bc120d742c6322b0ebc3 | treesnapshot (tar.gz zip) |
| parent | 4ed4b5475211fab6a0ad00eed2f9297395e7598e | commitdiff |
| parent | 888454c57a45511808d3fa52597b3d765df034a6 | commitdiff |
Merge /pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4] fib_trie: missing ntohl() when calling fib_semantic_match()
[NETFILTER]: xt_quota: add missing module aliases
[ATM]: [he] don't hold the device lock when upcalling
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4] fib_trie: missing ntohl() when calling fib_semantic_match()
[NETFILTER]: xt_quota: add missing module aliases
[ATM]: [he] don't hold the device lock when upcalling