Commits
Alexey Dobriyan authored 818c0c13b3bM
Merge 2.6.24.6 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.24.y into 2.6.24-openvz Conflicts: Makefile net/ipv6/netfilter/nf_conntrack_reasm.c net/sched/sch_generic.c