[XFS] Fix merge failures
[linux-2.6] / include / net / inet_frag.h
2008-07-10  Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-07-03  Russell KingMerge branch 'fb' into devel
2008-05-07  Russell KingMerge branch 'irq-fix' of git://modarm9.com/gitsrc...
2008-05-03  Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2008-05-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-01  Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-05-01  Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-04-30  Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-30  Paul MackerrasMerge git://git./pub/scm/linux/kernel/git/jk/spufs
2008-04-29  Russell KingMerge branches 'pxa' and 'orion-fixes1'
2008-04-29  Jeff GarzikMerge branch 'upstream-jeff' of git://git./linux/kernel...
2008-04-27  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-24  Trond MyklebustMerge branch 'devel'
2008-04-24  Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-24  Paul MackerrasMerge branch 'powerpc-next' of /linux/kernel/git/galak...
2008-04-23  David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-04-22  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-04-22  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-04-22  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-21  Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-04-21  Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2008-04-20  Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-20  Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-19  Russell KingMerge branch 'merge-fixes' into devel
2008-04-19  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-19  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6.26
2008-04-18  David S. MillerMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-14  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-04-03  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-04-03  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-28  Joe Perches[NET]: Rename inet_frag.h identifiers COMPLETE, FIRST_I...
2008-02-07  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07  Len BrownMerge branches 'release', 'misc' and 'misc-2.6.25'...
2008-02-07  Len BrownMerge branches 'release' and 'ppc-workaround' into...
2008-02-07  Len BrownMerge branches 'release' and 'hp-cid' into release
2008-02-07  Len BrownMerge branches 'release' and 'gpe-ack' into release
2008-02-07  Len BrownMerge branches 'release', 'cpuidle-2.6.25' and 'idle...
2008-02-07  Len BrownMerge branches 'release', 'bugzilla-6217', 'bugzilla...
2008-02-07  Len BrownMerge branches 'release' and 'autoload' into release
2008-02-07  Len BrownMerge branches 'release', 'asus', 'sony-laptop' and...
2008-02-07  Len BrownMerge branches 'release', 'acpi_pm_device_sleep_state...
2008-02-06  Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-03  David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-02-03  David WoodhouseMerge git://git.infradead.org/~kmpark/onenand-mtd-2.6
2008-02-03  David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-01  Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-31  Paul MackerrasMerge branch 'linux-2.6'
2008-01-30  Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/driver-2.6
2008-01-29  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6.25
2008-01-28  Pavel Emelyanov[NETNS][FRAGS]: Make the pernet subsystem for fragments.
2008-01-28  Pavel Emelyanov[NETNS][FRAGS]: Make the LRU list per namespace.
2008-01-28  Pavel Emelyanov[NETNS][FRAGS]: Isolate the secret interval from namesp...
2008-01-28  Pavel Emelyanov[NETNS][FRAGS]: Make thresholds work in namespaces.
2008-01-28  Pavel Emelyanov[NETNS][FRAGS]: Make the net.ipv4.ipfrag_timeout work...
2008-01-28  Pavel Emelyanov[NETNS][FRAGS]: Make the mem counter per-namespace.
2008-01-28  Pavel Emelyanov[NETNS][FRAGS]: Make the nqueues counter per-namespace.
2008-01-28  Pavel Emelyanov[NETNS][FRAGS]: Make the inet_frag_queue lookup work...
2007-11-20  Len BrownPull cpuidle into release branch
2007-11-17  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-10-29  Len BrownPull cpuidle into release branch
2007-10-24  Jeff GarzikMerge branch 'upstream-jeff' of git://git./linux/kernel...
2007-10-23  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-10-23  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-23  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-23  Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-10-21  Linus TorvaldsMerge branch 'master' of hera./linux/kernel/git/kyle...
2007-10-20  Jeff GarzikMerge branch 'fixes-jgarzik' of git://git./linux/kernel...
2007-10-19  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2007-10-19  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-10-19  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-10-19  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-10-18  Linus TorvaldsMerge /pub/scm/linux/kernel/git/bart/ide-2.6
2007-10-18  Linus TorvaldsMerge ssh:///linux/kernel/git/tglx/linux-2.6-hrt
2007-10-18  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-10-18  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-10-18  Linus TorvaldsMerge git://git./linux/kernel/git/mingo/linux-2.6-sched
2007-10-18  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-10-18  Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-10-18  David S. MillerMerge branch 'fixes-davem' of /linux/kernel/git/linvill...
2007-10-18  Pavel Emelyanov[INET]: Remove no longer needed ->equal callback
2007-10-18  Pavel Emelyanov[INET]: Consolidate xxx_find() in fragment management
2007-10-18  Pavel Emelyanov[INET]: Consolidate xxx_frag_create()
2007-10-18  Pavel Emelyanov[INET]: Consolidate xxx_frag_alloc()
2007-10-18  Pavel Emelyanov[INET]: Consolidate xxx_frag_intern
2007-10-17  Linus TorvaldsMerge branch 'xen-upstream' of git://git./linux/kernel...
2007-10-17  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-10-16  Linus TorvaldsMerge ssh:///pub/scm/linux/kernel/git/sam/kbuild
2007-10-16  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2007-10-15  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2007-10-15  Linus TorvaldsMerge branch 'locks' of git://linux-nfs.org/~bfields...
2007-10-15  Linus TorvaldsMerge branch 'release' of ssh:///linux/kernel/git/aegl...
2007-10-15  Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-10-15  Pavel Emelyanov[INET]: Consolidate the xxx_put
2007-10-15  Pavel Emelyanov[INET]: Consolidate the xxx_evictor
2007-10-15  Pavel Emelyanov[INET]: Consolidate the xxx_frag_destroy
2007-10-15  Pavel Emelyanov[INET]: Consolidate xxx_the secret_rebuild
2007-10-15  Pavel Emelyanov[INET]: Consolidate the xxx_frag_kill
2007-10-15  Pavel Emelyanov[INET]: Collect common frag sysctl variables together
next