xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflicts:
	drivers/infiniband/hw/nes/nes_cm.c

Simple whitespace conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2012-02-10 23:32:28 -05:00
parent d9dd966d7f 8df54d622a
commit d5ef8a4d87
448 changed files with 3446 additions and 43114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/renesas/sh_eth.h
View File

@@ -575,9 +575,6 @@ enum RPADIR_BIT {
RPADIR_PADR = 0x0003f,
};
/* RFLR */
#define RFLR_VALUE 0x1000
/* FDR */
#define DEFAULT_FDR_INIT 0x00000707