Merge by hand (conflicts in sd.c)
[deliverable/linux.git] / net / 802 /
2005-09-06  James BottomleyMerge by hand (conflicts in sd.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-23  Tony LuckPull prarit-bus-sysdata into release branch
2005-08-22  Tony LuckAuto-update from upstream
2005-08-18  Linus TorvaldsMerge /pub/scm/linux/kernel/git/bart/ide-2.6
2005-08-18  Linus TorvaldsMerge head 'upstream-fixes' of /linux/kernel/git/jgarzi...
2005-08-18  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-08-18  Jay Vosburgh[TOKENRING]: Use interrupt-safe locking with rif_lock.
2005-08-15  Len BrownMerge ../to-linus-stable/
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/gregkh/i2c-2.6
2005-07-12  Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
2005-07-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-07-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-07-12  Alexey Dobriyan[NET]: __be'ify *_type_trans()
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-18  Russell KingMerge with ../linux-2.6-smp
2005-06-17  James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-15  Tony LuckAuto merge with /home/aegl/GIT/linus