Merge by hand (conflicts in sr.c)
[linux-2.6] / arch / x86_64 / kernel / smpboot.c
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-23  Tony LuckPull prarit-bus-sysdata into release branch
2005-08-22  Tony LuckAuto-update from upstream
2005-08-20  Andi Kleen[PATCH] x86_64: Fix race in TSC synchronization
2005-08-16  Linus TorvaldsMerge head 'for-linus' of /linux/kernel/git/shaggy...
2005-08-15  Len BrownMerge ../to-linus-stable/
2005-08-12  Tony LuckAuto-update from upstream
2005-08-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-08-12  Eric W. Biederman[PATCH] x86_64: Fix apicid versus cpu# confusion.
2005-08-04  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-08-04  Linus TorvaldsMerge head 'for-linus' of /linux/kernel/git/roland...
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 Brownmerge 2.6.13-rc4 with ACPI's to-linus tree
2005-07-30  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-29  Eric W. Biederman[PATCH] Fix sync_tsc hang
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-07-29  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-arm-smp
2005-07-29  Linus TorvaldsMerge head 'upstream' of /linux/kernel/git/jgarzik...
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-07-29  Nishanth Aravamudan[PATCH] x86_64: Use msleep in smpboot.c
2005-07-29  Andi Kleen[PATCH] x86_64: Clarify Booting processor ... message
2005-07-29  Andi Kleen[PATCH] x86_64: Move cpu_present/possible_map parsing...
2005-07-28  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-28  Roland DreierMerge /scratch/Ksrc/linux-git/
2005-07-28  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-07-27  Linus TorvaldsMerge head 'for-linus' of /linux/kernel/git/shaggy...
2005-07-27  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-07-27  Linus TorvaldsMerge /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-07-27  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-arm-smp
2005-07-27  Olaf Hering[PATCH] turn many #if $undefined_string into #ifdef...
2005-07-27  Andi Kleen[PATCH] x86_64: fix SMP boot lockup on some machines
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-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  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
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-26  Linus TorvaldsMerge Christoph's freeze cleanup patch
2005-06-25  Ashok Raj[PATCH] x86_64: Dont use broadcast shortcut to make...
2005-06-25  Ashok Raj[PATCH] x86_64: CPU hotplug sibling map cleanup
2005-06-25  Ashok Raj[PATCH] x86_64: CPU hotplug support
2005-06-25  Ashok Raj[PATCH] x86_64: Change init sections for CPU hotplug...
2005-06-15  Tony LuckAuto merge with /home/aegl/GIT/linus
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 viro
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   <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-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-05-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-31  Linus TorvaldsMerge ... /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-05-28   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch master
2005-05-28   <jgarzik@pretzel... Merge ... fr.zoreil.com/linux-2.6.git branch HEAD
2005-05-27  Christoph HellwigMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-27   <jgarzik@pretzel... Merge ... /linux/kernel/git/torvalds/linux-2.6.git...
2005-05-26  James BottomleyAutomatic merge of ../scsi-misc-2.6-old/
2005-05-26   <jgarzik@pretzel... Merge ... /linux/kernel/git/torvalds/linux-2.6.git...
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch tlan
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch sis900
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch veth
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch qeth
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ns83820
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch natsemi
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch forcedeth
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch airo
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch atmel
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch amd8111
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch pcnet32
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ixgb
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch e1000
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch e100
2005-05-23  Thomas GleixnerMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-21  Anton AltaparmakovMerge with /usr/src/ntfs-2.6.git
2005-05-21  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-20  Andi Kleen[PATCH] x86_64: i386/x86-64: Export cpu_core_map
2005-05-19  Linus TorvaldsMerge ... /linux/kernel/git/davem/sparc-2.6.git/
2005-05-19  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-17  Tony LuckMerge with linus
next