aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-05 16:59:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-05 16:59:46 -0700
commitff3ea47c623276e9772cbc268471224648d5a7fe (patch)
treeecb77b11659f85abefed71aa075d4f879a7cc116 /Makefile
parenta8c725045eb2eaa6c28a5493cb193f47a5c4afe4 (diff)
parent36485707bbd9729e0c52315b173aeed9bc2303dd (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [BRIDGE]: fix locking and memory leak in br_add_bridge [IRDA]: Missing allocation result check in irlap_change_speed(). [PPPOE]: Missing result check in __pppoe_xmit(). [NET]: Eliminate unused /proc/sys/net/ethernet [NETCONSOLE]: Clean up initcall warning. [TCP]: Avoid skb_pull if possible when trimming head
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions