[XFS] Fix merge failures
[pandora-kernel.git] / arch / sh / Kconfig
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-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2008-12-25 Ingo MolnarMerge branch 'sched/urgent'; commit 'v2.6.28' into...
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 James MorrisMerge branch 'next' into for-linus
2008-12-24 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-12-23 Ingo MolnarMerge branch 'x86/iommu' 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 git://git./linux/kernel/git/davem/net-2.6
2008-12-22 Paul Mundtsh: dma: Kill off ISA DMA wrapper.
2008-12-22 Paul Mundtdoc: Update sh cpufreq documentation.
2008-12-22 Paul Mundtsh: Kill off cf-enabler with extreme prejudice.
2008-12-22 Paul Mundtsh: mach-sh03: Move off of cf_enabler to pata_platform...
2008-12-22 Matt Flemingsh: Enable GENERIC_HARDIRQS_NO__DO_IRQ for all SuperH...
2008-12-22 Paul Mundtsh: Generic kgdb stub support.
2008-12-22 Paul Mundtsh: Enable HAVE_ARCH_TRACEHOOK for all SH, now that...
2008-12-22 Magnus Dammsh: allow CONFIG_CPU_IDLE
2008-12-22 Magnus Dammsh: allow CONFIG_PM
2008-12-22 Peter Griffinsh: Add support for SH7201 CPU subtype.
2008-12-22 Matt Flemingsh: dynamic ftrace support.
2008-12-22 Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
2008-12-20 Takashi IwaiMerge branch 'topic/hda-resume-fix' into topic/hda
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-12-19 Takashi IwaiMerge branch 'fix/asoc' into for-linus
2008-12-19 Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/ring-buffer...
2008-12-19 Takashi IwaiMerge branch 'topic/hda-doc' into topic/hda
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 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-12-18 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-12-18 Paul MackerrasMerge branch 'linux-2.6' into next
2008-12-17 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/doc
2008-12-16 Ingo MolnarMerge branch 'x86/cpufeature' into x86/tsc
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/cpufeature
2008-12-16 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-16 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-12-16 Linus TorvaldsMerge branch 'sh/for-2.6.28' of git://git./linux/kernel...
2008-12-16 Paul Mundtsh: Disable GENERIC_HARDIRQS_NO__DO_IRQ for unconverted...
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-28 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
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 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
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...
next