Merge by hand (conflicts in scsi_lib.c)
[linux-2.6] / drivers / sbus / char / vfc.h
2005-12-15  James BottomleyMerge by hand (conflicts in scsi_lib.c)
2005-12-15  Al Viro[PATCH] sparc: vfc __iomem annotations and fixes
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
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  James BottomleyMerge by hand (conflicts in sd.c)
2005-09-06  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-08-31  Russell King[SERIAL] Clean up and fix tty transmission start/stoping
2005-08-30  Linus TorvaldsMerge refs/heads/drm-latest from /linux/kernel/git...
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 'sis190'
2005-08-29  Jeff Garzik/spare/repo/netdev-2.6 branch 'uli-tulip'
2005-08-29  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-serial.git
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-18  Dave JonesMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-08-17  Jeff GarzikMerge /spare/repo/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-15  Jeff Garzik/spare/repo/netdev-2.6 branch 'ieee80211'
2005-08-15  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-11  Len BrownMerge acpi-2.6.12 to-akpm
2005-08-11  Len BrownMerge ../to-linus
2005-08-11  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-10  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-10  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-10  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-08-10  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-08-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-08-09  David WoodhouseMerge with /shiny/git/linux-2.6/.git
2005-08-05  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-08-05  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-08-04  Christoph Hellwig[SPARC]: Fix up sleep_on() removal in vfc driver.
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2