From: Greg Kroah-Hartman Date: Thu, 25 Aug 2011 15:27:26 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E into staging... X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~864^2~115 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c2de3e742494813acfb93140cf42ca22f4d62ce;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge git://git./linux/kernel/git/lwfinger/r8192E into staging-next * git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E: (166 commits) staging: rtl8192e: Remove files that are not used staging: rtl8192e: Convert typedefs that can be replaced with #define staging: rtl8192e: Convert typedef HT_AGGRE_SIZE_E to enum ht_aggre_size staging: rtl8192e: Convert typedef RATR_TABLE_MODE_8192S to enum ratr_table_mode_8192s staging: rtl8192e: Convert typedef FW_CMD_IO_TYPE to enum fw_cmd_io_type staging: rtl8192e: Convert typedef SCAN_OPERATION_BACKUP_OPT to enum scan_op_backup_opt staging: rtl8192e: Convert typedef country_code_type_t to enum country_code_type staging: rtl8192e: Convert typedef WOLPATTERN_TYPE to enum wol_pattern_type staging: rtl8192e: Convert typedef RT_RF_POWER_STATE to enum rt_rf_power_state staging: rtl8192e: Convert typedef RT_JOIN_ACTION to enum rt_join_action staging: rtl8192e: Convert typedef IPS_CALLBACK_FUNCION to enum ips_callback_function staging: rtl8192e: Convert typedef RT_PS_MODE to enum rt_ps_mode staging: rtl8192e: Convert typedef Fsync_State to enum fsync_state staging: rtl8192e: Convert typedef erp_t to enum erp_t staging: rtl8192e: Convert typedef WIRELESS_NETWORK_TYPE to enum wireless_network_type staging: rtl8192e: Convert typedef WIRELESS_MODE to enum wireless_mode staging: rtl8192e: Convert typedef RT_RF_TYPE_DEF to enum rt_rf_type_def staging: rtl8192e: Convert typedef LED_CTL_MODE to enum led_ctl_mode staging: rtl8192e: Convert typedef InitialGainOpType to enum init_gain_op_type staging: rtl8192e: Convert typedef BA_ACTION to enum ba_action ... --- 1c2de3e742494813acfb93140cf42ca22f4d62ce