From: Greg Kroah-Hartman Date: Wed, 24 Aug 2011 04:15:32 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E into staging... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a813833df88e7489fe637d6479a79bd9796f77a4;p=deliverable%2Flinux.git Merge git://git./linux/kernel/git/lwfinger/r8192E into staging-next * git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E: (61 commits) staging: rtl8192e: Fix compilation warnings staging: rtl8192e: Fix unload/reload problem staging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT staging: rtl8192e: Remove dead code associated with EFUSE_REPG_WORKAROUND staging: rtl8192e: Remove LOOP_TEST as parameter staging: rtl8192e: Remove dead code associated with CONFIG_FW_SETCHAN staging: rtl8192e: Remove dead code associated with CONFIG_RTLWIFI_DEBUGFS staging: rtl8192e: Remove dead code associated with _RTL8192_EXT_PATCH_ staging: rtl8192e: Remove ifdefs for CONFIG_RTLLIB_DEBUG staging: rtl8192e: Remove dead code associated with RTL819x_DEBUG staging: rtl8192e: Remove dead code associated with _ENABLE_SW_BEACON staging: rtl8192e: Remove dead code associated with CONFIG_CRYPTO_HMAC staging: rtl8192e: Remove dead code associated with CONFIG_BT_30 staging: rtl8192e: Remove dead code associated with ENABLE_NULL_PT_DEBUG staging: rtl8192e: Remove dead code associated with CONFIG_64BIT_DMA staging: rtl8192e: Remove dead code associated with CONFIG_RTLLIB_CRYPT_TKIP staging: rtl8192e: Remove dead code associated with IRQF_SHARED staging: rtl8192e: Remove dead code associated with CONFIG_CFG_80211 staging: rtl8192e: Remove dead code associated with BUILT_IN_CRYPTO ... --- a813833df88e7489fe637d6479a79bd9796f77a4