From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 19 Oct 2007 18:54:39 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=804b908adfcffe3831621acb6c8a776585983d2a;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: Fix possible dev_deactivate race condition
  [INET]: Justification for local port range robustness.
  [PACKET]: Kill unused pg_vec_endpage() function
  [NET]: QoS/Sched as menuconfig
  [NET]: Fix bug in sk_filter race cures.
  [PATCH] mac80211: make ieee802_11_parse_elems return void
---

804b908adfcffe3831621acb6c8a776585983d2a