From: David S. Miller <davem@davemloft.net>
Date: Thu, 17 Jun 2010 21:19:06 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.36-rc1~571^2~540
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=bb9c03d8a6893517737b16fdbeb54be3c73b3023

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

bb9c03d8a6893517737b16fdbeb54be3c73b3023
diff --cc drivers/net/wireless/iwlwifi/iwl-commands.h
index c579965ec556,498492565912..28b1098334f7
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@@ -1364,12 -1364,12 +1364,12 @@@ struct iwl_rx_phy_res 
  	__le32 rate_n_flags;	/* RATE_MCS_* */
  	__le16 byte_count;	/* frame's byte-count */
  	__le16 reserved3;
 -} __attribute__ ((packed));
 +} __packed;
  
- struct iwl4965_rx_mpdu_res_start {
+ struct iwl_rx_mpdu_res_start {
  	__le16 byte_count;
  	__le16 reserved;
 -} __attribute__ ((packed));
 +} __packed;
  
  
  /******************************************************************************