Merge by hand (conflicts in sr.c)
[linux-2.6] / drivers / w1 / w1.c
2005-08-28  James BottomleyMerge by hand (conflicts in sr.c)
2005-08-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-tmp
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-16  Linus TorvaldsMerge head 'for-linus' of /linux/kernel/git/shaggy...
2005-08-15  Len BrownMerge ../to-linus-stable/
2005-08-12  Tony LuckAuto-update from upstream
2005-08-12  Evgeniy Polyakov[PATCH] w1: more debug level decrease.
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-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-07-26  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-07-23  Luming Yu/home/lenb/linux-2.6 branch 'acpi-2.6.12'
2005-07-13  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-07-13  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-07-13  Linus TorvaldsMerge /home/torvalds/linux-2.6-arm
2005-07-13  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-13  Thomas GleixnerMerge with rsync://fileserver/linux
2005-07-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/lenb/linux-2.6
2005-07-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2005-07-12  Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
2005-07-11  Evgeniy Polyakov[PATCH] w1: fix CRC calculation on bigendian platforms.
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-26  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26  Thomas GleixnerMerge with rsync://fileserver/linux
2005-06-26  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
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...
2005-06-26  Linus TorvaldsMerge Christoph's freeze cleanup patch
2005-06-26  Christoph Lameter[PATCH] Cleanup patch for process freezing
2005-06-23  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-06-22  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-06-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/aegl/linux-2.6.git
2005-06-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2005-06-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/w1-2.6
2005-06-22  Evgeniy Polyakov[PATCH] w1: reconnect feature.
2005-06-22  Evgeniy Polyakov[PATCH] w1: Adds a default family so that new slave...
2005-06-22  Evgeniy Polyakov[PATCH] w1: Adds a sysfs entry (w1_master_search) that...
2005-06-22  Evgeniy Polyakov[PATCH] w1: Added the triplet w1 master method and...
2005-06-22  Evgeniy Polyakov[PATCH] w1: new family structure.
2005-06-22  Evgeniy Polyakov[PATCH] w1: cleanups.
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
2005-06-20  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2005-06-20  Yani Ioannou[PATCH] Driver Core: drivers/usb/input/aiptek.c - drive...
2005-04-19  Linus TorvaldsMerge ... /linux/kernel/git/gregkh/driver-2.6.git/
2005-04-19  Linus TorvaldsMerge ... /linux/kernel/git/gregkh/aoe-2.6.git/
2005-04-19  Linus TorvaldsMerge /linux/kernel/git/gregkh/i2c-2.6.git/
2005-04-19  johnpol@2ka.mipt.ru[PATCH] w1: real fix for big endian machines.
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2