tree 9664d4395ae8e590e50c568225ea88435383ed99
parent 1b3e4c706c19dec10b11dac1b23071e3e4b262ad
parent ce0e32e65f70337e0732c97499b643205fa8ea31
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192820079 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192820079 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/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