summaryrefslogtreecommitdiffstats
path: root/init/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-10-04 20:56:38 +0200
committerDavid S. Miller <davem@davemloft.net>2010-10-04 20:56:38 +0200
commit21a180cda012e1f93e362dd4a9b0bfd3d8c92940 (patch)
tree0e0d10baa3fdcd8ffbc6881076ff1695808dad9d /init/Makefile
parentnet: introduce DST_NOCACHE flag (diff)
parentsctp: Fix out-of-bounds reading in sctp_asoc_get_hmac() (diff)
downloadlinux-21a180cda012e1f93e362dd4a9b0bfd3d8c92940.tar.xz
linux-21a180cda012e1f93e362dd4a9b0bfd3d8c92940.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/ipv4/Kconfig net/ipv4/tcp_timer.c
Diffstat (limited to 'init/Makefile')
0 files changed, 0 insertions, 0 deletions