projects / linux-2.6 / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge by hand (conflicts in sr.c)
[linux-2.6] / net / core / sock.c
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c blob | commitdiff | raw
2005-08-15  Len BrownMerge ../to-linus-stable/ blob | commitdiff | raw
2005-08-04  Len Brown/home/lenb/src/to-linus-stable branch 'acpi-2.6.12' blob | commitdiff | raw
2005-08-03  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12' blob | commitdiff | raw
2005-07-30  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12' blob | commitdiff | raw
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq blob | commitdiff | raw
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq blob | commitdiff | raw
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input blob | commitdiff | raw
2005-07-29  Linus TorvaldsMerge head 'upstream' of /linux/kernel/git/jgarzik... blob | commitdiff | raw
2005-07-28  Dave KleikampMerge with /home/shaggy/git/linus-clean/ blob | commitdiff | raw
2005-07-28  Roland DreierMerge /scratch/Ksrc/linux-git/ blob | commitdiff | raw
2005-07-28  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6 blob | commitdiff | raw
2005-07-27  Linus TorvaldsMerge head 'for-linus' of /linux/kernel/git/shaggy... blob | commitdiff | raw
2005-07-27  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6 blob | commitdiff | raw
2005-07-27  Kyle Moffett[NET]: Fix setsockopt locking bug blob | commitdiff | raw
2005-07-26  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6 blob | commitdiff | raw | diff to current
2005-07-23  Luming Yu/home/lenb/linux-2.6 branch 'acpi-2.6.12' blob | commitdiff | raw | diff to current
2005-07-13  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git. blob | commitdiff | raw | diff to current
2005-07-13  Dave KleikampMerge with /home/shaggy/git/linus-clean/ blob | commitdiff | raw | diff to current
2005-07-12  Todd PoynorMerge with rsync://fileserver/linux blob | commitdiff | raw | diff to current
2005-07-12  Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2... blob | commitdiff | raw | diff to current
2005-07-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/tglx/mtd-2.6 blob | commitdiff | raw | diff to current
2005-07-11  Tony LuckAuto merge with /home/aegl/GIT/linus blob | commitdiff | raw | diff to current
2005-07-11  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6 blob | commitdiff | raw | diff to current
2005-07-09  Linus TorvaldsMerge head 'drm-fixes' of /linux/kernel/git/airlied... blob | commitdiff | raw | diff to current
2005-07-09  Linus TorvaldsMerge head 'drm-3264' of /linux/kernel/git/airlied... blob | commitdiff | raw | diff to current
2005-07-09  Linus TorvaldsMerge head 'drm-via' of /linux/kernel/git/airlied/drm-2.6 blob | commitdiff | raw | diff to current
2005-07-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6 blob | commitdiff | raw | diff to current
2005-07-08  Victor Fusco[NET]: Fix sparse warnings blob | commitdiff | raw | diff to current
2005-06-28  Tony LuckAuto merge with /home/aegl/GIT/ia64-test blob | commitdiff | raw | diff to current
2005-06-27  Linus TorvaldsMerge /linux/kernel/git/dtor/input.git manually blob | commitdiff | raw | diff to current
2005-06-26  Jeff GarzikMerge /spare/repo/linux-2.6/ blob | commitdiff | raw | diff to current
2005-06-26  Thomas GleixnerMerge with rsync://fileserver/linux blob | commitdiff | raw | diff to current
2005-06-26  Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor... blob | commitdiff | raw | diff to current
2005-06-23  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git. blob | commitdiff | raw | diff to current
2005-06-21  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git blob | commitdiff | raw | diff to current
2005-06-20  Tony LuckAuto merge with /home/aegl/GIT/linus blob | commitdiff | raw | diff to current
2005-06-20  Dave KleikampMerge with /home/shaggy/git/linus-clean/ blob | commitdiff | raw | diff to current
2005-06-19  Russell KingMerge with ../linux-2.6-smp blob | commitdiff | raw | diff to current
2005-06-19  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm blob | commitdiff | raw | diff to current
2005-06-19  Arnaldo Carvalho... [NET] Generalise TCP's struct open_request minisock... blob | commitdiff | raw | diff to current
2005-06-15  Tony LuckAuto merge with /home/aegl/GIT/linus blob | commitdiff | raw | diff to current
2005-06-02  Dave KleikampMerge with /home/shaggy/git/linus-clean/ blob | commitdiff | raw | diff to current
2005-05-21  Anton AltaparmakovMerge with /usr/src/ntfs-2.6.git blob | commitdiff | raw | diff to current
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation... blob | commitdiff | raw | diff to current
2005-05-17  Tony LuckMerge ... temp tree to get David's gdb inferior calls... blob | commitdiff | raw | diff to current
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus... blob | commitdiff | raw | diff to current
2005-05-05  Jesper Juhl[PATCH] update Ross Biro bouncing email address blob | commitdiff | raw | diff to current
2005-05-05  Linus TorvaldsMerge ... /linux/kernel/git/davem/sparc-2.6.git blob | commitdiff | raw | diff to current
2005-05-05  Linus TorvaldsMerge ... /linux/kernel/git/davem/net-2.6.git blob | commitdiff | raw | diff to current
2005-05-05  Arnaldo Carvalho... [IPV6]: Fix OOPS when using IPV6_ADDRFORM blob | commitdiff | raw | diff to current
2005-05-03  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git blob | commitdiff | raw | diff to current
2005-05-01  Pavel Pisa[PATCH] DocBook: changes and extensions to the kernel... blob | commitdiff | raw | diff to current
2005-04-27  Linus TorvaldsMerge ... /linux/kernel/git/aegl/linux-2.6.git blob | commitdiff | raw | diff to current
2005-04-26  Linus TorvaldsMerge ... kernel.org:/home/rmk/linux-2.6-rmk.git blob | commitdiff | raw | diff to current
2005-04-26  Linus TorvaldsMerge ... /linux/kernel/git/gregkh/usb-2.6.git/ blob | commitdiff | raw | diff to current
2005-04-26  Al Viro[NET]: kill gratitious includes of major.h blob | commitdiff | raw | diff to current
2005-04-26  Al Viro[PATCH] kill gratitious includes of major.h under net/* blob | commitdiff | raw | diff to current
2005-04-20  Arnaldo Carvalho... [SOCK]: on failure free the sock from the right place blob | commitdiff | raw | diff to current
2005-04-16  Arnaldo Carvalho... [PATCH] net: don't call kmem_cache_create with a spinlo... blob | commitdiff | raw | diff to current
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2 blob | commitdiff | raw | diff to current
Making Linux better for my computers