[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / net / ipv4 / tcp_diag.c
2006-09-30  Linus TorvaldsMerge branch 'intelfb-patches' of /linux/kernel/git...
2006-09-26  Tony LuckPull esi-support into release branch
2006-09-26  Tony LuckPull model-name into release branch
2006-07-15  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-07-13  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-07-05  Jeff GarzikMerge branch 'upstream' of git://lost.foo-projects...
2006-07-04  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-07-04  Linus TorvaldsMerge git://git.infradead.org/hdrinstall-2.6
2006-07-04  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-serial
2006-07-04  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2006-07-03  Sam RavnborgMerge branch 'master' of /home/sam/kernel/linux-2.6/
2006-07-03  Kumar GalaMerge branch '83xx' into for_paulus
2006-07-03  Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2006-07-03  James BottomleyMerge ../scsi-misc-2.6
2006-07-03  Steven WhitehouseMerge git./linux/kernel/git/torvalds/linux-2.6
2006-07-02  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2006-07-01  Len BrownPull acpi_device_handle_cleanup into release branch
2006-07-01  Len BrownPull acpi_os_free into release branch
2006-07-01  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-07-01  Len BrownPull acpi_device_handle_cleanup into release branch
2006-07-01  Len BrownPull kmalloc into release branch
2006-06-30  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2006-06-30  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-06-30  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-06-30  Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2006-06-30  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-06-30  Jörn EngelRemove obsolete #include <linux/config.h>
2006-06-30  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-06-30  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-06-29  Sridhar Samudrala[TCP]: Export accept queue len of a TCP listening socke...
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-09-14  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dwmw2/audit-2.6
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
2005-09-08  James BottomleyMerge HEAD from ../scsi-iscsi-2.6
2005-09-08  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-06  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-09-04  Dmitry TorokhovMerge HEAD from /linux/kernel/git/torvalds/linux-2...
2005-09-03  Len BrownMerge linux-2.6 into linux-acpi-2.6 test
2005-09-02  Linus TorvaldsMerge HEAD from kernel.org:/home/rmk/linux-2.6-arm
2005-09-01  Jeff Garzik/spare/repo/netdev-2.6 branch 'ieee80211'
2005-09-01  Jeff Garzik/spare/repo/netdev-2.6 branch 'master'
2005-09-01  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-arm.git
2005-08-31  Russell King[SERIAL] Clean up and fix tty transmission start/stoping
2005-08-30  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-08-30  Jeff GarzikMerge HEAD from /spare/repo/linux-2.6/.git
2005-08-30  Tony LuckAuto-update from upstream
2005-08-30  Linus TorvaldsMerge refs/heads/for-linus from /linux/kernel/git/shagg...
2005-08-30  Linus TorvaldsMerge refs/heads/drm-latest from /linux/kernel/git...
2005-08-30  Jeff Garzik/spare/repo/libata-dev branch 'master'
2005-08-30  Jeff Garzik/spare/repo/libata-dev branch 'master'
2005-08-30  Linus TorvaldsMerge refs/heads/upstream-fixes from /linux/kernel...
2005-08-30  Linus TorvaldsMerge refs/heads/upstream from /linux/kernel/git/jgarzi...
2005-08-30  Linus TorvaldsMerge HEAD from /linux/kernel/git/paulus/ppc64-2.6
2005-08-30  Linus TorvaldsMerge HEAD from /linux/kernel/git/davem/net-2.6.git
2005-08-29  Arnaldo Carvalho... [INET_DIAG]: Move the tcp_diag interface to the proper...
2005-08-29  Arnaldo Carvalho... [INET_DIAG]: Rename tcp_diag.[ch] to inet_diag.[ch]
2005-08-29  Arnaldo Carvalho... [TCPDIAG]: Just rename everything to inet_diag
2005-08-29  Arnaldo Carvalho... [TCPDIAG]: Introduce inet_diag_{register,unregister}
2005-08-29  Arnaldo Carvalho... [IPV6]: Generalise the tcp_v6_lookup routines
2005-08-29  Arnaldo Carvalho... [TCPDIAG]: Introduce CONFIG_IP_TCPDIAG_DCCP
2005-08-29  Arnaldo Carvalho... [TCPDIAG]: Implement cheapest way of supporting DCCPDIA...
2005-08-29  Arnaldo Carvalho... [ICSK]: Move TCP congestion avoidance members to icsk
2005-08-29  Arnaldo Carvalho... [NET]: Introduce inet_connection_sock
2005-08-29  Arnaldo Carvalho... [INET]: Generalise the TCP sock ID lookup routines
2005-08-29  Arnaldo Carvalho... [INET]: Generalise tcp_tw_bucket, aka TIME_WAIT sockets
2005-08-29  Arnaldo Carvalho... [INET]: Generalise the tcp_listen_ lock routines
2005-08-29  Arnaldo Carvalho... [INET]: Move tcp_port_rover to inet_hashinfo
2005-08-29  Arnaldo Carvalho... [INET]: Just rename the TCP hashtable functions/structs...
2005-08-29  Harald Welte[NETLINK]: Add properly module refcounting for kernel...
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-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-07-30  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-23  Luming Yu/home/lenb/linux-2.6 branch 'acpi-2.6.12'
2005-07-13  Dave KleikampMerge with /home/shaggy/git/linus-clean/
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-26  Linus TorvaldsMerge 'drm-3264' branch of /linux/kernel/git/airlied...
2005-06-26  Linus TorvaldsMerge 'drm-fixes' branch of /linux/kernel/git/airlied...
next