Merge by hand (conflicts between pending drivers and kfree cleanups)
[linux-2.6] / sound / synth / emux / emux.c
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-10-28  Tony LuckPull xpc-disengage into release branch
2005-10-28  Tony LuckPull new-efi-memmap into release branch
2005-10-28  Tony LuckPull altix-mmr into release branch
2005-10-28  Tony LuckPull altix-fpga-reset into release branch
2005-10-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-old
2005-10-21  Steve FrenchMerge ... /linux/kernel/git/sfrench/cifs-2.6.git/
2005-10-06  Jeff GarzikMerge branch 'master'
2005-09-25  Dave Airlieupdate from upstream
2005-09-24  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-24  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-20  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-14  Tony LuckPull fix-offsets-h into release branch
2005-09-13  David S. MillerMerge /pub/scm/linux/kernel/git/acme/net-2.6
2005-09-13  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-09-13  David S. MillerMerge /linux/kernel/git/holtmann/bluetooth-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dwmw2/audit-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/perex/alsa-current
2005-09-12  Takashi Iwai[ALSA] Replace with kzalloc() - others
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
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-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-15  Len BrownMerge 'acpi-2.6.12' branch into to-akpm
2005-08-15  Len BrownMerge ../to-linus-stable/
2005-08-11  Len BrownMerge acpi-2.6.12 to-akpm
2005-08-10  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-05  Len Brown[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
2005-08-04  Len Brown/home/lenb/src/to-akpm branch 'acpi-2.6.12'
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-07-02  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-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-27  Linus TorvaldsMerge /linux/kernel/git/dtor/input.git manually
2005-06-27  Jeff GarzikMerge /spare/repo/netdev-2.6/ branch 'ieee80211'
2005-06-27  Jeff GarzikMerge /spare/repo/linux-2.6/
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-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-25  Anton AltaparmakovAutomerge with /usr/src/ntfs-2.6.git.
2005-06-24  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-24  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-06-23  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-06-23  Linus TorvaldsMerge /pub/scm/linux/kernel/git/paulus/ppc64-2.6
2005-06-23  Paulo Marques[PATCH] create a kstrdup library function
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2