Fix up SCSI mismerge
[pandora-kernel.git] / sound / oss /
2005-12-15 James BottomleyMerge by hand (conflicts in scsi_lib.c)
2005-12-15 Sergei Shtylylov[PATCH] Au1550 AC'97 OSS driver spinlock fixes
2005-11-21 David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-18 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-18 Jeff GarzikMerge branch 'upstream-fixes' of git://git.tuxdriver...
2005-11-18 Jeff GarzikMerge branch 'halasa-hdlc' of git://git.tuxdriver.com...
2005-11-16 Jeff GarzikMerge branch 'upstream-fixes'
2005-11-15 Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2005-11-15 Linus TorvaldsMerge x86-64 update from Andi
2005-11-14 Paul MackerrasMerge git://oak/home/sfr/kernels/iseries/work
2005-11-14 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-14 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-fixes-2.6
2005-11-14 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-14 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-14 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-11-14 Jeff Garzik[PATCH] move pm_register/etc. to CONFIG_PM_LEGACY,...
2005-11-12 Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2005-11-11 Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-drvmodel
2005-11-11 Jeff GarzikMerge branch 'atmel'
2005-11-10 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-11-10 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-10 Tony LuckPull add-mmio-to-proc-iomem into release branch
2005-11-10 Tony LuckPull context-bitmap into release branch
2005-11-10 Tony LuckPull extend-notify-die into release branch
2005-11-10 Tony LuckPull memoryless-node-allocation into release branch
2005-11-10 Tony LuckPull mca-check-psp into release branch
2005-11-10 Tony LuckPull align-sig-frame into release branch
2005-11-10 James BottomleyMerge by hand (whitespace conflicts in libata.h)
2005-11-10 Paul MackerrasMerge git://oak/home/sfr/kernels/iseries/work
2005-11-10 Paul MackerrasMerge ../linux-2.6
2005-11-09 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2005-11-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-09 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-09 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-11-09 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-11-09 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-11-09 Olaf Hering[PATCH] changing CONFIG_LOCALVERSION rebuilds too much...
2005-11-09 Adrian Bunk[PATCH] schedule obsolete OSS drivers for removal
2005-11-09 Jeff GarzikMerge branch 'master'
2005-11-09 Jeff GarzikMerge rsync://bughost.org/repos/ipw-delta/
2005-11-09 Jeff GarzikMerge rsync://bughost.org/repos/ieee80211-delta/
2005-11-08 James BottomleyMerge by hand (conflicts between pending drivers and...
2005-11-08 Jeff GarzikMerge git://git.tuxdriver.com/git/netdev-jwl
2005-11-08 Jeff GarzikMerge branch 'master'
2005-11-08 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-11-08 Paul MackerrasMerge ../linux-2.6
2005-11-07 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-11-07 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-07 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/tglx/mtd-2.6
2005-11-07 Adrian BunkOSS MIPS drivers: "extern inline" -> "static inline"
2005-11-07 Tony LuckAuto-update from upstream
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/bunk/trivial
2005-11-07 Linus TorvaldsMerge branch 'block-dir' of git://brick.kernel.dk/data...
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/perex/alsa
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/acme/net-2.6
2005-11-07 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-11-07 Adrian Bunk[PATCH] sound/oss/sequencer_syms: unexport reprogram_timer
2005-11-06 Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 James BottomleyMerge by Hand
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Linus TorvaldsMerge branch 'srp' of /linux/kernel/git/roland/infiniband
2005-11-05 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-03 Ian WienandInput: convert dmasound_awacs (OSS) to dynamic input...
2005-11-02 Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-10-31 Tony Luckmanual update from upstream:
2005-10-31 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-10-31 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-10-31 Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-drvmodel
2005-10-31 Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-31 Paul MackerrasMerge ../linux-2.6 by hand
2005-10-31 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-10-31 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-31 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-10-31 Tim Schmielau[PATCH] fix missing includes
2005-10-31 Jean Delvare[PATCH] Typo fix: dot after newline in printk strings
2005-10-31 Jeff Garzik[PATCH] remove some more check_region stuff
2005-10-30 Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-29 Jeff GarzikMerge branch 'master'
2005-10-29 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-29 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2005-10-29 Ralf BaechleUseless includes of everything, the kitchen sink and...
2005-10-29 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-10-29 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-10-29 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-10-29 Arnaldo Carvalho... Merge /pub/scm/linux/kernel/git/sridhar/lksctp-2.6
2005-10-29 Jeff GarzikMerge branch 'upstream'
2005-10-28 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-10-28 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2005-10-28 Roland DreierMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-10-28 Jeff GarzikMerge branch 'master'
2005-10-28 Jeff GarzikMerge branch 'master'
2005-10-28 Grant Coady[PATCH] pci_ids: macros: replace partial with whole...
2005-10-28 Tony LuckPull xpc-disengage into release branch
next