mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 12:10:52 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: include/asm-powerpc/unistd.h include/asm-sparc/unistd.h include/asm-sparc64/unistd.h Signed-off-by: David Woodhouse <[email protected]>
This commit is contained in:
commit
66643de455
432 changed files with 9399 additions and 3746 deletions
|
|
@ -11,7 +11,6 @@
|
|||
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/types.h>
|
||||
#include <asm/bitops.h>
|
||||
#include <asm/intrinsics.h>
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue