Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

This commit is contained in:
David S. Miller
2010-06-17 14:19:06 -07:00
106 changed files with 4950 additions and 2440 deletions

View File

@@ -1366,7 +1366,7 @@ struct iwl_rx_phy_res {
__le16 reserved3;
} __packed;
struct iwl4965_rx_mpdu_res_start {
struct iwl_rx_mpdu_res_start {
__le16 byte_count;
__le16 reserved;
} __packed;