Merge by hand (conflicts in sr.c)
[linux-2.6] / sound / oss / sonicvibes.c
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
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-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  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-12  Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
2005-07-06  Artem B. BityuckiyMerge with rsync://fileserver/linux
2005-06-30  Anton AltaparmakovAutomerge with /usr/src/ntfs-2.6.git.
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-28  Greg KHMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-06-28  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-06-28  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-27  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/usb-2.6
2005-06-27  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-06-27  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-06-27  Linus TorvaldsMerge 'upstream' branch of /linux/kernel/git/jgarzik...
2005-06-27  Linus TorvaldsMerge 'upstream' branch of /linux/kernel/git/jgarzik...
2005-06-27  Linus TorvaldsMerge 'upstream' branch of /linux/kernel/git/jgarzik...
2005-06-27  Linus TorvaldsMerge /linux/kernel/git/dtor/input.git manually
2005-06-06  Dmitry TorokhovMerge ... /linux/kernel/git/torvalds/linux-2.6
2005-06-01  Dmitry TorokhovInput: sonicvibes (OSS) - do not carry around gameport...
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  Adrian Bunk[PATCH] sound/oss/sonicvibes.c: fix an array overflow
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2