A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source 
Conflicts:
	drivers/net/phy/marvell.c

Simple overlapping changes in drivers/net/phy/marvell.c

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2014-11-01 14:53:27 -04:00
commit 55b42b5ca2
884 changed files with 18904 additions and 8410 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/s390/char/Kconfig
View file

@ -105,7 +105,7 @@ config SCLP_ASYNC
config HMC_DRV
def_tristate m
prompt "Support for file transfers from HMC drive CD/DVD-ROM"
depends on 64BIT
depends on S390 && 64BIT
select CRC16
help
This option enables support for file transfers from a Hardware