aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv/include/uapi/asm/socket.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-30 16:58:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-30 16:58:05 -0800
commit597690cd02684b7e4904288e4b85797123a5093f (patch)
treef5d2a84771b9d532f2fe99a9cf4e0b51f5432e26 /arch/frv/include/uapi/asm/socket.h
parentMerge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block (diff)
parentfrv: Remove redundant debugging info flag (diff)
downloadlinux-dev-597690cd02684b7e4904288e4b85797123a5093f.tar.xz
linux-dev-597690cd02684b7e4904288e4b85797123a5093f.zip
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek: - fix make -s detection with make-4.0 - fix for scripts/setlocalversion when the kernel repository is a submodule - do not hardcode ';' in macros that expand to assembler code, as some architectures' assemblers use a different character for newline - Fix passing --gdwarf-2 to the assembler * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: frv: Remove redundant debugging info flag mn10300: Remove redundant debugging info flag kbuild: Fix debugging info generation for .S files arch: use ASM_NL instead of ';' for assembler new line character in the macro kbuild: Fix silent builds with make-4 Fix detectition of kernel git repository in setlocalversion script [take #2]
Diffstat (limited to 'arch/frv/include/uapi/asm/socket.h')
0 files changed, 0 insertions, 0 deletions