[XFS] Fix merge failures
[linux-2.6] / include / net / udplite.h
2008-12-29  Lachlan McIlroy[XFS] Fix merge failures
2008-12-29  Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-next
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-28  James MorrisMerge branch 'next' into for-linus
2008-12-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-24  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-06  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-27  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-21  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-19  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-11  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-07  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-10-31  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-10-29  Eric Dumazetudp: introduce struct udp_table and multiple spinlocks
2008-05-01  Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-03-12  David S. MillerMerge branch 'master' of /linux/kernel/git/linville...
2008-03-07  David S. Miller[UDP]: Revert udplite and code split.
2008-03-05  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-03-04  YOSHIFUJI Hideaki[UDP]: Allow users to configure UDP-Lite.
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  Herbert Xu[UDP]: Restore missing inDatagrams increments
2007-07-22  Len BrownPull throttle into release branch
2007-07-22  Len BrownPull misc into release branch
2007-07-22  Len BrownPull battery into release branch
2007-07-22  Len BrownPull acpi-debug into release branch
2007-07-17  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-07-15  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-07-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-18  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2007-06-15  Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2007-06-15  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-06-13  Jeff GarzikMerge branch 'libertas-fixes' of git://git./linux/kerne...
2007-06-13  Jeff GarzikMerge branch 'libertas' of git://git./linux/kernel...
2007-06-12  David S. MillerMerge branch 'mac80211-fixes' of git://git./linux/kerne...
2007-06-11  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-11  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-06-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-06-11  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-09  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2007-06-08  Linus TorvaldsMerge git://git.linux-xtensa.org/kernel/xtensa-feed
2007-06-08  Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/sparc-2.6
2007-06-08  Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-06-07  David S. Miller[UDP]: Revert 2-pass hashing changes.
2007-06-05  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-06-04  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-23  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-15  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2007-05-13  Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-05-11  Linus TorvaldsMerge branch 'linus' of /linux/kernel/git/perex/alsa
2007-05-11  Linus TorvaldsMerge branch 'master' of ssh:///linux/kernel/git/mcheha...
2007-05-11  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-05-11  Wim Van SebroeckMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-05-11  Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2007-05-11  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-05-11  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-05-11  Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/data...
2007-05-11  Linus TorvaldsMerge branch 'audit.b38' of git://git./linux/kernel...
2007-05-11  Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2007-05-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2007-05-11  David S. Miller[UDP]: Fix AF-specific references in AF-agnostic code.
2007-05-10  Linus TorvaldsMerge branch 'juju' of git://git./linux/kernel/git...
2007-05-10  Len BrownPull thermal into release branch
2007-05-09  Russell KingMerge branches 'armv7', 'at91', 'misc' and 'omap' into...
2007-05-08  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-07  Linus TorvaldsMerge branch 'server-cluster-locking-api' of git:/...
2007-05-07  Linus TorvaldsMerge branch 'drm-patches' of /linux/kernel/git/airlied...
2007-05-06  Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-05-05  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-05-05  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-05-05  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/voyager-2.6
2007-05-05  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-05-05  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-05-01  Wim Van SebroeckMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-05-01  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-04-30  Tony LuckPull mem-attribute into release branch
2007-04-30  Tony LuckPull percpu-dtc into release branch
next