Merge by Hand
[linux-2.6] / drivers / usb / host / sl811_cs.c
2005-11-05  James BottomleyMerge by Hand
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-02  Stephen RothwellMerge Paulus' tree
2005-11-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-11-02  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-02  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-02  Paul MackerrasMerge ../linux-2.6
2005-11-01  Anton AltaparmakovMerge branch 'master' of /home/src/linux-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 git://git./linux/kernel/git/aia21/ntfs-2.6
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-29  Russell KingCreate platform_device.h to contain all the platform...
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-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-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  Jeff GarzikMerge /spare/repo/netdev-2.6 branch 'ieee80211'
2005-07-13  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-07-13  Jeff GarzikMerge upstream 2.6.13-rc3 into ieee80211 branch of...
2005-07-13  David WoodhouseMerge with /shiny/git/linux-2.6/.git
2005-07-13  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-12  Todd PoynorMerge with rsync://fileserver/linux
2005-07-12  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-07-12  Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
2005-07-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/tglx/mtd-2.6
2005-07-11  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-07-09  Linus TorvaldsMerge head 'drm-fixes' of /linux/kernel/git/airlied...
2005-07-09  Linus TorvaldsMerge head 'drm-3264' of /linux/kernel/git/airlied...
2005-07-09  Linus TorvaldsMerge head 'drm-via' of /linux/kernel/git/airlied/drm-2.6
2005-07-08  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-07-08  Dominik Brodowski[PATCH] pcmcia: remove references to pcmcia/version.h
2005-07-08  Dominik Brodowski[PATCH] pcmcia: move event handler
2005-07-06  Artem B. BityuckiyMerge with rsync://fileserver/linux
2005-07-02  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-07-01  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-30  Anton AltaparmakovAutomerge with /usr/src/ntfs-2.6.git.
2005-06-28  Linus TorvaldsMerge head 'upstream-20050628-1' of /linux/kernel/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  Jeff GarzikMerge /spare/repo/netdev-2.6 branch 'ieee80211'
2005-06-28  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-28  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-28  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-06-28  David Brownell[PATCH] pcmcia id_table for sl811.cs
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-23  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-22  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-22  Jeff GarzikMerge upstream kernel changes into 'C/H/S support'...
2005-06-21  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-18  Russell KingMerge with ../linux-2.6-smp
2005-06-17  James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-15  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-08  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git
2005-06-06  Dmitry TorokhovMerge ... /linux/kernel/git/torvalds/linux-2.6
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch skge
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch starfire
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch smc91x
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch remove-drivers
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch iff-running
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch we18
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch viro
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch r8169
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch orinoco-hch
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ppp
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch hdlc
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch dm9000
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139too-iomap
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139cp
2005-06-04  Linus TorvaldsAutomatic merge of 'misc-fixes' branch from
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/libata-dev branch svw
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/libata-dev branch ahci-msi
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-03  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus-2.6
2005-06-02   <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-02  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-06-02  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-01  Linus TorvaldsMerge ... /linux/kernel/git/sfrench/cifs-2.6
2005-06-01  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
next