mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'for-next' into for-linus
Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c
This commit is contained in:
commit
318ae2edc3
246 changed files with 396 additions and 3454 deletions
|
|
@ -321,7 +321,7 @@ static atomic_t hifn_dev_number;
|
|||
#define HIFN_PUBOPLEN_MOD_M 0x0000007f /* modulus length mask */
|
||||
#define HIFN_PUBOPLEN_MOD_S 0 /* modulus length shift */
|
||||
#define HIFN_PUBOPLEN_EXP_M 0x0003ff80 /* exponent length mask */
|
||||
#define HIFN_PUBOPLEN_EXP_S 7 /* exponent lenght shift */
|
||||
#define HIFN_PUBOPLEN_EXP_S 7 /* exponent length shift */
|
||||
#define HIFN_PUBOPLEN_RED_M 0x003c0000 /* reducend length mask */
|
||||
#define HIFN_PUBOPLEN_RED_S 18 /* reducend length shift */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue