aboutsummaryrefslogtreecommitdiff
path: root/kernel/time
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-16 19:28:52 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-16 19:28:52 -0700
commit24c4ac070adffe4a21f3a8daf4aee7c98fa6c4f9 (patch)
tree7c9c4aaccb58cdde8e50634b74a41041001b624f /kernel/time
parentc334ba9e11849f0f23254d82a3305f6174cfbd95 (diff)
parentd35690beda1429544d46c8eb34b2e3a8c37ab299 (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: [IPV6]: ipv6_fl_socklist is inadvertently shared. [TCP]: Fix tcp_mem[] initialization. [NET]: Copy mac_len in skb_clone() as well [IPV4]: Do not disable preemption in trie_leaf_remove().
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions