[XFS] Fix merge failures
[pandora-kernel.git] / arch / powerpc / kernel / ftrace.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-25 Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/hw-branch...
2008-12-25 Ingo MolnarMerge branch 'x86/tsc' into tracing/core
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-24 Ingo MolnarMerge branch 'linus' into tracing/hw-branch-tracing
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 Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/ring-buffer...
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-05 Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/function...
2008-12-04 Ingo MolnarMerge commit 'v2.6.28-rc7' into tracing/core
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-02 Ingo MolnarMerge branches 'tracing/branch-tracer', 'tracing/ftrace...
2008-12-02 Ingo MolnarMerge branch 'tracing/urgent' into tracing/core
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 Steven Rostedtpowerpc: ftrace, use create_branch
2008-11-28 Steven Rostedtpowerpc: ftrace, added missing icache flush
2008-11-28 Steven Rostedtpowerpc: ftrace, fix cast aliasing and add code verific...
2008-11-26 Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-26 Ingo MolnarMerge branches 'tracing/hw-branch-tracing' and 'tracing...
2008-11-25 Ingo MolnarMerge branches 'tracing/core', 'x86/urgent' and 'x86...
2008-11-25 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24 Ingo MolnarMerge branches 'tracing/branch-tracer', 'tracing/fastbo...
2008-11-24 Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-23 Ingo MolnarMerge branch 'ppc/ftrace' of git://git./linux/kernel...
2008-11-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-20 Steven Rostedtpowerpc/ppc32: ftrace, dynamic ftrace to handle modules
2008-11-20 Steven Rostedtpowerpc/ppc64: ftrace, handle module trampolines for...
2008-11-20 Steven Rostedtpowerpc: ftrace, use probe_kernel API to modify code
2008-11-20 Steven Rostedtpowerpc: ftrace, convert to new dynamic ftrace arch API
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 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-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-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-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 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 '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 'x86-fixes-for-linus-2' of git://git....
2008-10-30 Ingo MolnarMerge branch 'linus' into tracing/ftrace
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-30 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-30 Russell KingMerge branch 'fix' of git://git./linux/kernel/git/ycmia...
2008-10-28 Linus TorvaldsMerge branch 'tracing-fixes-for-linus' of git://git...
2008-10-27 Ingo MolnarMerge commit 'v2.6.28-rc2' into tracing/urgent
2008-10-23 Steven Rostedtftrace, powerpc, sparc64, x86: remove notrace from...
2008-10-23 Steven Rostedtftrace: remove mcount set
2008-10-17 Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
next