Merge branch 'master' into ofed

diff --cc include/linux/compat-3.2.h
index 921e2888c8886ccb4347dac334dd90b6f11d7ee1,ef275664bd7735a494e2beb4b83c1fa9ebac52bb..789b4b5fac3e726ca7dcb6521a8f8d06a80e3a5a
--- 1/include/linux/compat-3.2.h
--- 2/include/linux/compat-3.2.h
+++ b/include/linux/compat-3.2.h
@@@ -7,13 -7,13 +7,17 @@@
  
  #include <linux/skbuff.h>
  #include <linux/dma-mapping.h>
 +#include <linux/ethtool.h>
  
+ /* backports b4625dab */
+ #define  SDIO_CCCR_REV_3_00    3       /* CCCR/FBR Version 3.00 */
+ #define  SDIO_SDIO_REV_3_00    4       /* SDIO Spec Version 3.00 */
+ 
  #define PMSG_IS_AUTO(msg)     (((msg).event & PM_EVENT_AUTO) != 0)
  
 +extern int __ethtool_get_settings(struct net_device *dev,
 +                                struct ethtool_cmd *cmd);
 +
  /**
   * skb_frag_page - retrieve the page refered to by a paged fragment
   * @frag: the paged fragment