diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-15 11:11:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-15 11:11:47 -0800 |
| commit | 9682ec9692e5ac11c6caebd079324e727b19e7ce (patch) | |
| tree | 16b25351557cd028913fc2c225e2db0175d750b6 /drivers/net/ethernet/marvell/sky2.c | |
| parent | 4ba63072b998cc31515cc6305c25f3b808b50c01 (diff) | |
| parent | adf305f77878880fa5868a7179979da93be68d83 (diff) | |
| download | linux-9682ec9692e5ac11c6caebd079324e727b19e7ce.tar.gz linux-9682ec9692e5ac11c6caebd079324e727b19e7ce.tar.bz2 linux-9682ec9692e5ac11c6caebd079324e727b19e7ce.zip | |
Merge tag 'driver-core-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg KH:
"Really tiny set of patches for this kernel. Nothing major, all
described in the shortlog and have been in linux-next for a while"
* tag 'driver-core-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
sysfs: fix warning when creating a sysfs group without attributes
firmware_loader: handle timeout via wait_for_completion_interruptible_timeout()
firmware_loader: abort request if wait_for_completion is interrupted
firmware: Correct function name in comment
device: Change dev_<level> logging functions to return void
device: Fix dev_dbg_once macro
Diffstat (limited to 'drivers/net/ethernet/marvell/sky2.c')
0 files changed, 0 insertions, 0 deletions