Merge by hand (conflicts in sr.c)
[linux-2.6] / drivers / video / nvidia /
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-15  Len BrownMerge ../to-linus-stable/
2005-08-10  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2005-08-10  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-08-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-08-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-08-08  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-08-08  Antonino Daplas[PATCH] nvidiafb: Fix initial display corruption on...
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-12  Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
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  Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-23  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-06-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/aegl/linux-2.6.git
2005-06-22  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-22  Linus TorvaldsMerge rsync://oss.sgi.com/git/xfs-2.6
2005-06-22  James Simmons[PATCH] fbdev: fill in the access_align field.
2005-06-22  James Simmons[PATCH] fbdev: stack reduction
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-17  Tony LuckMerge ... temp tree to get David's gdb inferior calls...
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-03  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-01  Antonino A. Daplas[PATCH] nvidiafb: ioremap and i2c fixes
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2