Merge branch 'from-linus' into upstream
[linux-2.6] / net / ipv4 / xfrm4_tunnel.c
2006-04-29  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-04-18  Dave JonesMerge ../linus
2006-04-04  Kumar GalaMerge branch 'master'
2006-04-02  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-04-02  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-04-02  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/perex/alsa
2006-04-02  Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2006-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-04-02  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/paulus/powerpc
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-04-02  Dmitry TorokhovManual merge with Linus.
2006-04-01  Paul MackerrasMerge branch 'for_paulus' of git://git./linux/kernel...
2006-04-01  Herbert Xu[IPSEC]: Kill unused decap state argument
2006-04-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-04-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-04-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-03-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-03-30  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-03-30  Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-03-30  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-03-30  Jeff GarzikMerge branch 'mv-merge'
2006-03-29  Jeff GarzikMerge branch 'upstream' of git://git./linux/kernel...
2006-03-29  Jeff GarzikMerge branch 'master'
2006-03-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-03-29  Herbert Xu[INET]: Introduce tunnel4/tunnel6
2006-03-25  Linus TorvaldsMerge branch 'audit.b3' of git://git./linux/kernel...
2006-03-25  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-03-25  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-03-25  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2006-03-24  Trond MyklebustMerge branch 'linus'
2006-03-23  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2006-03-23  Anton AltaparmakovMerge branch 'master' of /home/aia21/ntfs-2.6/
2006-03-23  Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2006-03-23  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-03-22  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-03-22  Nathan ScottMerge HEAD from ../linux-2.6
2006-03-21  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-03-21  Jeff GarzikMerge branch 'e1000-fixes' of git://198.78.49.142/...
2006-03-21  James BottomleyMerge ../linux-2.6
2006-03-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/herbert/crypto-2.6
2006-03-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-03-21  Arjan van de Ven[NET] sem2mutex: net/
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
2005-09-06  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-08-29  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-29  Jeff Garzik/spare/repo/libata-dev branch 'v2.6.13'
2005-08-29  Jeff Garzik/spare/repo/netdev-2.6 branch 'uli-tulip'
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-18  Dave JonesMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-08-15  Len BrownMerge 'acpi-2.6.12' branch into to-akpm
2005-08-15  Len BrownMerge ../to-linus-stable/
2005-08-11  Len BrownMerge acpi-2.6.12 to-akpm
2005-08-10  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-05  Len Brown[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
2005-08-04  Len Brown/home/lenb/src/to-akpm branch 'acpi-2.6.12'
2005-08-04  Len Brown/home/lenb/src/to-linus-stable branch 'acpi-2.6.12'
2005-08-03  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-08-03  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-07-30  Jeff Garzik/spare/repo/netdev-2.6 branch 'ieee80211'
2005-07-30  Jeff Garzik/spare/repo/netdev-2.6 branch 'master'
2005-07-30  Dave AirlieMerge ../linux-2.6/
2005-07-30  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-07-27  Linus TorvaldsMerge head 'for-linus' of /linux/kernel/git/shaggy...
2005-07-27  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-07-26  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-07-26  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-25  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-07-24  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-07-23  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-07-23  Luming Yu/home/lenb/linux-2.6 branch 'acpi-2.6.12'
2005-07-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-07-19  Patrick McHardy[NET]: Make ipip/ip6_tunnel independant of XFRM
2005-07-12  Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
2005-07-02  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-28  Tony LuckAuto merge with /home/aegl/GIT/ia64-test
2005-06-28  Russell King[PATCH] ARM SMP: TLB implementations only affect local CPU
2005-06-27  Linus TorvaldsMerge /linux/kernel/git/dtor/input.git manually
2005-06-27  Jeff GarzikMerge /spare/repo/netdev-2.6/ branch 'ieee80211'
2005-06-27  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26  Thomas GleixnerMerge with rsync://fileserver/linux
2005-06-26  Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-23  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-06-23  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-23  Steve FrenchMerge ... /linux/kernel/git/sfrench/cifs-2.6.git
2005-06-23  Jeremy AllisonMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-22  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-22  Jeff GarzikMerge upstream kernel changes into 'C/H/S support'...
2005-06-22  Linus TorvaldsMerge rsync://oss.sgi.com/git/xfs-2.6
2005-06-21  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-21  Linus TorvaldsMerge 'for-linus' branch of /linux/kernel/git/shaggy...
2005-06-21  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
next