• Linus Torvalds's avatar
    Merge branch 'header-fixes-for-linus' of... · ba1eb95c
    Linus Torvalds authored
    Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
      x86: headers cleanup - setup.h
      emu101k1.h: fix duplicate include of <linux/types.h>
      compiler-gcc4: conditionalize #error on __KERNEL__
      remove __KERNEL_STRICT_NAMES
      make netfilter use strict integer types
      make drm headers use strict integer types
      make MTD headers use strict integer types
      make most exported headers use strict integer types
      make exported headers use strict posix types
      unconditionally include asm/types.h from linux/types.h
      make linux/types.h as assembly safe
      Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
      headers_check fix cleanup: linux/reiserfs_fs.h
      headers_check fix cleanup: linux/nubus.h
      headers_check fix cleanup: linux/coda_psdev.h
      headers_check fix: x86, setup.h
      headers_check fix: x86, prctl.h
      headers_check fix: linux/reinserfs_fs.h
      headers_check fix: linux/socket.h
      headers_check fix: linux/nubus.h
      ...
    
    Manually fix trivial conflicts in:
    	include/linux/netfilter/xt_limit.h
    	include/linux/netfilter/xt_statistic.h
    ba1eb95c
Name
Last commit
Last update
..
basic Loading commit data...
genksyms Loading commit data...
kconfig Loading commit data...
ksymoops Loading commit data...
mod Loading commit data...
package Loading commit data...
rt-tester Loading commit data...
selinux Loading commit data...
trace Loading commit data...
tracing Loading commit data...
.gitignore Loading commit data...
Kbuild.include Loading commit data...
Lindent Loading commit data...
Makefile Loading commit data...
Makefile.build Loading commit data...
Makefile.clean Loading commit data...
Makefile.fwinst Loading commit data...
Makefile.headersinst Loading commit data...
Makefile.host Loading commit data...
Makefile.lib Loading commit data...
Makefile.modinst Loading commit data...
Makefile.modpost Loading commit data...
bin2c.c Loading commit data...
binoffset.c Loading commit data...
bloat-o-meter Loading commit data...
bootgraph.pl Loading commit data...
checkincludes.pl Loading commit data...
checkkconfigsymbols.sh Loading commit data...
checkpatch.pl Loading commit data...
checkstack.pl Loading commit data...
checksyscalls.sh Loading commit data...
checkversion.pl Loading commit data...
cleanfile Loading commit data...
cleanpatch Loading commit data...
config Loading commit data...
conmakehash.c Loading commit data...
decodecode Loading commit data...
diffconfig Loading commit data...
export_report.pl Loading commit data...
extract-ikconfig Loading commit data...
gcc-version.sh Loading commit data...
gcc-x86_64-has-stack-protector.sh Loading commit data...
gen_initramfs_list.sh Loading commit data...
headerdep.pl Loading commit data...
headers.sh Loading commit data...
headers_check.pl Loading commit data...
headers_install.pl Loading commit data...
ihex2fw.c Loading commit data...
kallsyms.c Loading commit data...
kernel-doc Loading commit data...
makelst Loading commit data...
markup_oops.pl Loading commit data...
mkcompile_h Loading commit data...
mkmakefile Loading commit data...
mksysmap Loading commit data...
mkuboot.sh Loading commit data...
mkversion Loading commit data...
namespace.pl Loading commit data...
patch-kernel Loading commit data...
pnmtologo.c Loading commit data...
profile2linkerlist.pl Loading commit data...
recordmcount.pl Loading commit data...
setlocalversion Loading commit data...
show_delta Loading commit data...
tags.sh Loading commit data...
unifdef.c Loading commit data...
ver_linux Loading commit data...