From: Linus Torvalds Date: Wed, 20 Sep 2006 03:36:22 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3752aee96538b582b089f4a97a26e2ccd9403929;p=linux-beck.git 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 --- 3752aee96538b582b089f4a97a26e2ccd9403929