From: Linus Torvalds Date: Fri, 4 Aug 2006 00:33:32 +0000 (-0700) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.18-rc4~47 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8861e98115f185d9946d92deaee6c3639ef8d414;p=linux-2.6 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] myri10ge - Fix spurious invokations of the watchdog reset handler [PATCH] myri10ge - Write the firmware in 256-bytes chunks [PATCH] Stop calling phy_stop_interrupts() twice [PATCH] s2io driver bug fixes #2 [PATCH] s2io driver bug fixes #1 [PATCH] zd1211rw: Packet filter fix for managed (STA) mode [PATCH] zd1211rw: Fixed endianess issue with length info tag detection [PATCH] zd1211rw: Remove bogus assert [PATCH] zd1211rw: Fix software encryption/decryption [PATCH] zd1211rw: Pass more management frame types up to host [PATCH] zd1211rw: Fixes radiotap header --- 8861e98115f185d9946d92deaee6c3639ef8d414