• Linus Torvalds's avatar
    Merge tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · fea8893d
    Linus Torvalds authored
    Pull rtl8812ae staging wireless driver from Greg KH:
     "Here's a single staging driver for a wireless chipset that has shown
      up in the SteamBox hardware.  It is merged separately from the "main"
      staging pull request to sync up with the wireless api changes that
      came in from the networking tree.
    
      It's self-contained and works for me and others.  Larry will be
      replacing it with a "real" driver for 3.15, but for now this one is
      needed"
    
    * tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
      staging: r8821ae: Enable build by reverting BROKEN marking
      staging: r8821ae: Fix build problems
      Staging: rtl8812ae: disable due to build errors
      Staging: rtl8821ae: add TODO file
      Staging: rtl8821ae: removed unused functions and variables
      Staging: rtl8821ae: rc.c: fix up function prototypes
      Staging: rtl8812ae: Add Realtek 8821 PCI WIFI driver
    fea8893d
Kconfig 3.4 KB