summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/genet/bcmgenet.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-08 12:37:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-08 12:37:29 -0700
commit0afccc4ccecf8436b8e59369b384f6d0a56c90d1 (patch)
treeac96c672450f400af1b1b47c6d01713341e10c7c /drivers/net/ethernet/broadcom/genet/bcmgenet.c
parente4f30545a23b6e22fb347a1ad034ce1aa280209c (diff)
parentdda26427bd5252cbea876fe8a80050943c0dc642 (diff)
downloadlinux-0afccc4ccecf8436b8e59369b384f6d0a56c90d1.tar.bz2
Merge tag 'staging-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull more staging patches from Greg KH: "Here are some more staging patches for 3.15-rc1. They include a late-submission of a wireless driver that a bunch of people seem to have the hardware for now. As it's stand-alone, it should be fine (now passes the 0-day random build bot tests). There are also some fixes for the unisys drivers, as they were causing havoc on a number of different machines. To resolve all of those issues, we just mark the driver as BROKEN now, and we can fix it up "properly" over time" * tag 'staging-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: rtl8723au: The 8723 only has two paths Staging: unisys: mark drivers as BROKEN Staging: unisys: verify that a control channel exists staging: unisys: Add missing close parentheses in filexfer.c staging: r8723au: Fix build problem when RFKILL is not selected staging: r8723au: Fix randconfig build errors staging: r8723au: Turn on build of new driver staging: r8723au: Additional source patches staging: r8723au: Add source files for new driver - part 4 staging: r8723au: Add source files for new driver - part 3 staging: r8723au: Add source files for new driver - part 2 staging: r8723au: Add source files for new driver - part 1
Diffstat (limited to 'drivers/net/ethernet/broadcom/genet/bcmgenet.c')
0 files changed, 0 insertions, 0 deletions