]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Sep 2007 15:55:54 +0000 (08:55 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 26 Sep 2007 15:55:54 +0000 (08:55 -0700)
commite4b42be77ecc663550b515fcb7761b01fac0f272
tree5bc22f300b79324ae995e1cf24e33607db85675c
parent4aee491cd4e4f1069bfbab309cbd653313938d80
parent2aee6198652b32e5eaef29a8f8330a9dd15b8efd
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