[XFS] Fix merge failures
[pandora-kernel.git] / arch / x86 / kernel / machine_kexec_32.c
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 branches 'x86/pat2' and 'x86/fpu'; commit 'v2...
2008-12-25 Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/aoa' into to-push
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 branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
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-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/doc
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-04 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-12-03 Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-12-01 Takashi IwaiMerge branch 'upstream' into topic/asoc
2008-11-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-26 Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24 Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-23 Ingo MolnarMerge commit 'v2.6.28-rc6' into x86/debug
2008-11-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-20 Ingo MolnarMerge branch 'linus' into x86/memory-corruption-check
2008-11-20 Ingo MolnarMerge branch 'linus' into x86/uv
2008-11-18 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-12 Ingo MolnarMerge branch 'linus' into x86/crashdump
2008-11-12 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-12 Len BrownMerge branch 'sony' into release
2008-11-12 Len BrownMerge branch 'power' into release
2008-11-12 Len BrownMerge branch 'misc' into release
2008-11-12 Len BrownMerge branch 'bugzilla-11539' into release
2008-11-12 Len BrownMerge branch 'bugzilla-11312' into release
2008-11-10 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-10 Ingo MolnarMerge commit 'v2.6.28-rc4' into x86/apic
2008-11-10 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-11-09 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-11-08 Ingo MolnarMerge branch 'linus' into x86/cleanups
2008-11-07 Ingo MolnarMerge branch 'oprofile-for-tip' of git://git./linux...
2008-11-07 Niv SardiMerge branch 'master' of git://oss.sgi.com:8090/xfs...
2008-11-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-11-06 Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-05 James MorrisMerge branch 'master' into next
2008-11-03 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-11-03 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-03 Linus TorvaldsMerge branch 'proc-linus' of git://git./linux/kernel...
2008-11-03 Linus TorvaldsMerge branch 'drm-next' of git://git./linux/kernel...
2008-11-03 Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/markers'...
2008-11-03 Ingo MolnarMerge commit 'v2.6.28-rc3' into tracing/ftrace
2008-11-03 Ingo MolnarMerge commit 'v2.6.28-rc3' into sched/core
2008-11-02 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-11-01 Linus TorvaldsMerge branch 'link_removal' of git://jni.nu/cris
2008-11-01 Linus TorvaldsMerge branch 'cris_move' of git://www.jni.nu/cris
2008-10-31 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-10-31 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-10-31 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-31 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-10-31 Huang Yingkexec/i386: setup kexec page table in C
2008-10-31 Huang Yingkexec/i386: allocate page table pages dynamically
2008-10-31 Paul MundtMerge branch 'master' of /linux/kernel/git/torvalds...
2008-10-31 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-10-31 David S. MillerMerge branch 'master' of git://git.infradead.org/users...
2008-10-31 David S. MillerMerge branch 'davem-fixes' of /linux/kernel/git/jgarzik...
2008-10-31 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-10-31 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-10-31 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-10-31 Linus TorvaldsMerge branch 'tracing-fixes-for-linus' of git://git...
2008-10-31 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-10-30 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-fixes
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-10-30 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-30 Linus TorvaldsMerge branch 'bugfixes' of git://git.linux-nfs.org...
2008-10-30 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-28 Ken'ichi Ohmichix86, kdump: fix invalid access on i386 sparsemem
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-17 Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
2008-10-16 Dmitry TorokhovMerge branch 'next' into for-linus
2008-10-15 Ingo MolnarMerge branches 'core/softlockup', 'core/softirq', ...
2008-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 Ingo MolnarMerge branch 'linus' into oprofile-v2
2008-10-12 Ingo MolnarMerge branches 'x86/xen', 'x86/build', 'x86/microcode...
2008-10-11 Ingo MolnarMerge branch 'x86/apic' into x86-v28-for-linus-phase4-B
2008-10-10 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
next