diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-20 05:36:22 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-20 05:36:22 +0200 |
commit | 3752aee96538b582b089f4a97a26e2ccd9403929 (patch) | |
tree | 162601df617d057d1c56bc120d742c6322b0ebc3 /include/mtd | |
parent | Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6 (diff) | |
parent | [IPV4] fib_trie: missing ntohl() when calling fib_semantic_match() (diff) | |
download | linux-3752aee96538b582b089f4a97a26e2ccd9403929.tar.xz linux-3752aee96538b582b089f4a97a26e2ccd9403929.zip |
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:
[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
Diffstat (limited to 'include/mtd')
0 files changed, 0 insertions, 0 deletions