From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 26 Sep 2007 15:55:54 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.23-rc9~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4b42be77ecc663550b515fcb7761b01fac0f272;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'upstream-linus' of /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
---

e4b42be77ecc663550b515fcb7761b01fac0f272