summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-01 10:29:59 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-01 10:29:59 -0800
commitfea8893da7c52906caa1a8dc3199f4b2ed3b8dbd (patch)
tree56e3482be95e2f1bd1386ecb3bc104a55f68f5e7 /fs
parent04480094de7242d08bb62088e713fd7fe00443b4 (diff)
parentd7216f8f02da54f8f235c5cca562a55b7f52210d (diff)
downloadop-kernel-dev-fea8893da7c52906caa1a8dc3199f4b2ed3b8dbd.zip
op-kernel-dev-fea8893da7c52906caa1a8dc3199f4b2ed3b8dbd.tar.gz
Merge tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud