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

Merge 3.16-rc5 into char-misc-next

Browse Source 
This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2014-07-13 15:26:47 -07:00
parent 2a211f320e 1795cd9b3a
commit 9f48c89862
1115 changed files with 13940 additions and 8180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-generic/vmlinux.lds.h
View File

@@ -696,7 +696,7 @@
. = ALIGN(PAGE_SIZE); \
*(.data..percpu..page_aligned) \
. = ALIGN(cacheline); \
*(.data..percpu..readmostly) \
*(.data..percpu..read_mostly) \
. = ALIGN(cacheline); \
*(.data..percpu) \
*(.data..percpu..shared_aligned) \