tree 5bc22f300b79324ae995e1cf24e33607db85675c
parent 4aee491cd4e4f1069bfbab309cbd653313938d80
parent 2aee6198652b32e5eaef29a8f8330a9dd15b8efd
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1190822154 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1190822154 -0700

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] WE : Add missing auth compat-ioctl
  [PATCH] softmac: Fix inability to associate with WEP networks