[XFS] Fix merge failures
[linux-2.6] / arch / x86 / kernel / cpu /
2008-12-29  Lachlan McIlroy[XFS] Fix merge failures
2008-12-29  Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-next
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-28  James MorrisMerge branch 'next' into for-linus
2008-12-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-12-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28  Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-12-28  Linus TorvaldsMerge branch 'sched-core-for-linus' of git://git./linux...
2008-12-28  Linus TorvaldsMerge branch 'tracing-core-for-linus' of git://git...
2008-12-28  Linus TorvaldsMerge branch 'x86-core-for-linus' of git://git./linux...
2008-12-25  Ingo MolnarMerge branch 'sched/urgent'; commit 'v2.6.28' into...
2008-12-25  Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/hw-branch...
2008-12-25  Ingo MolnarMerge branch 'x86/tsc' into tracing/core
2008-12-25  Ingo MolnarMerge branches 'x86/pat2' and 'x86/fpu'; commit 'v2...
2008-12-25  Takashi IwaiMerge branch 'topic/udev-id-rename' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/sound-core-fix' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/pcxhr-update' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/oxygen' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/cs5535audio' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/convert-tasklet' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/ca0106' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/audigy-capture-boost' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/asoc' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-25  Frederic Weisbeckertracing/ftrace: don't trace on early stage of a seconda...
2008-12-25  James MorrisMerge branch 'next' into for-linus
2008-12-24  Ingo MolnarMerge branch 'linus' into tracing/hw-branch-tracing
2008-12-24  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-12-24  Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-23  Ingo MolnarMerge branch 'x86/irq' into x86/core
2008-12-23  Ingo MolnarMerge branch 'x86/iommu' into x86/core
2008-12-23  Ingo MolnarMerge branch 'x86/tsc' into x86/core
2008-12-23  Ingo MolnarMerge branch 'x86/ptrace' into x86/tsc
2008-12-23  Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-23  Ingo MolnarMerge branch 'x86/apic' into x86/irq
2008-12-23  Ingo MolnarMerge commit 'v2.6.28-rc9' into x86/apic
2008-12-22  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-12-22  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-12-22  Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
2008-12-20  Takashi IwaiMerge branch 'topic/ca0106-spdif-stream' into topic...
2008-12-20  Takashi IwaiMerge branch 'topic/ca0106-resume' into topic/ca0106
2008-12-20  Takashi IwaiMerge branch 'topic/ca0106-capture-no-44khz' into topic...
2008-12-20  Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-20  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-20  Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-12-19  Jaswinder Singhx86: common.c boot_cpu_stack and boot_exception_stacks...
2008-12-19  Takashi IwaiMerge branch 'fix/asoc' into for-linus
2008-12-19  Takashi IwaiMerge branch 'fix/asoc' into topic/asoc
2008-12-19  Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/ring-buffer...
2008-12-19  Suresh Siddhax86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
2008-12-19  Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-18  Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-18  Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-18  Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-12-16  Andi Kleenx86: re-enable MCE on secondary CPUS after suspend...
2008-12-16  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/uv
2008-12-16  Hiroshi Shimamotox86: hardirq: use inc_irq_stat() in non-unified functions
2008-12-16  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/doc
2008-12-16  Venki Pallipadix86: support always running TSC on Intel CPUs
2008-12-16  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/cpufeature
2008-12-16  Ingo MolnarMerge branches 'tracing/fastboot', 'tracing/ftrace...
2008-12-12  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/irq
2008-12-12  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-12  Markus Metzgerx86, bts: provide in-kernel branch-trace interface
2008-12-09  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-08  Ingo MolnarMerge branch 'linus' into x86/quirks
2008-12-08  Ingo MolnarMerge branch 'sched/urgent' into sched/core
2008-12-05  Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/function...
2008-12-05  Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-12-05  Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-12-04  Ingo MolnarMerge commit 'v2.6.28-rc7' into x86/cleanups
2008-12-04  Ingo MolnarMerge branches 'tracing/ftrace' and 'tracing/function...
2008-12-04  Ingo MolnarMerge commit 'v2.6.28-rc7' into tracing/core
2008-12-04  James MorrisMerge branch 'master' into next
2008-12-04  Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-12-03  Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-12-03  Paul MackerrasMerge branch 'merge'
2008-12-03  Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-12-03  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-02  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-12-02  Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-12-02  Linus TorvaldsMerge branch 'kvm-updates/2.6.28' of git://git./linux...
2008-12-02  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-12-02  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-12-02  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-12-02  Ingo MolnarMerge branches 'tracing/branch-tracer', 'tracing/ftrace...
2008-12-02  Ingo MolnarMerge branch 'tracing/urgent' into tracing/core
2008-12-02  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-12-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-01  Takashi IwaiMerge branch 'upstream' into topic/asoc
2008-12-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-01  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
next