History log of /linux/arch/powerpc/platforms/cell/Kconfig (Results 276 – 300 of 459)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 907bc6c7 06-Oct-2009 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-2.6.32' into for-2.6.33


Revision tags: v2.6.32-rc3
# 1669b049 29-Sep-2009 James Morris <jmorris@namei.org>

Merge branch 'master' into next


Revision tags: v2.6.32-rc1, v2.6.32-rc2
# 8b3f6af8 25-Sep-2009 David S. Miller <davem@davemloft.net>

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/st

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/staging/cpc-usb/cpc.h
drivers/staging/cpc-usb/cpc_int.h
drivers/staging/cpc-usb/cpcusb.h

show more ...


# d7a4b414 23-Sep-2009 Frederic Weisbecker <fweisbec@gmail.com>

Merge commit 'linus/master' into tracing/kprobes

Conflicts:
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_event_types.h
kernel/trace/trace_export.c

Merge reason:
Sync with late

Merge commit 'linus/master' into tracing/kprobes

Conflicts:
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_event_types.h
kernel/trace/trace_export.c

Merge reason:
Sync with latest significant tracing core changes.

show more ...


# f0568783 23-Sep-2009 Anton Vorontsov <avorontsov@ru.mvista.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
drivers/power/wm97xx_battery.c


# ae19ffba 22-Sep-2009 Russell King <rmk+kernel@arm.linux.org.uk>

Merge branch 'master' into for-linus


# 7cce2f4c 21-Sep-2009 Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux-next

Conflicts:
fs/ubifs/super.c

Merge the upstream tree in order to resolve a conflict with th

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux-next

Conflicts:
fs/ubifs/super.c

Merge the upstream tree in order to resolve a conflict with the
per-bdi writeback changes from the linux-2.6-block tree.

show more ...


# 6469f540 20-Sep-2009 David Woodhouse <David.Woodhouse@intel.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
drivers/mtd/mtdcore.c

Merged in order that I can apply the Nomadik nand/onenand support patches.


# 40d743b8 19-Sep-2009 Russell King <rmk+kernel@arm.linux.org.uk>

Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6


# 929bf0d0 19-Sep-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into perfcounters/core

Merge reason: Bring in tracing changes we depend on.

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# c602c65b 19-Sep-2009 Len Brown <len.brown@intel.com>

Merge branch 'linus' into sfi-release

Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c

Signed-off-by: Len Brown <len.brown@intel.com>


# 71fd68e7 19-Sep-2009 Len Brown <len.brown@intel.com>

Merge branch 'linus' into release


# 45bd00d3 17-Sep-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into tracing/core

Merge reason: Pick up kernel/softirq.c update for dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# ea88023b 16-Sep-2009 Paul Mundt <lethal@linux-sh.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/sh/kernel/vmlinux.lds.S


# 723e9db7 15-Sep-2009 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
powerpc/nvram: Enable use Ge

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
powerpc/nvram: Enable use Generic NVRAM driver for different size chips
powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
powerpc/ps3: Workaround for flash memory I/O error
powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
powerpc/perf_counters: Reduce stack usage of power_check_constraints
powerpc: Fix bug where perf_counters breaks oprofile
powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
powerpc/irq: Improve nanodoc
powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
powerpc/book3e: Add missing page sizes
powerpc/pseries: Fix to handle slb resize across migration
powerpc/powermac: Thermal control turns system off too eagerly
powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
powerpc/405ex: support cuImage via included dtb
powerpc/405ex: provide necessary fixup function to support cuImage
powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
powerpc/44x: Update Arches defconfig
powerpc/44x: Update Arches dts
...

Fix up conflicts in drivers/char/agp/uninorth-agp.c

show more ...


Revision tags: v2.6.31, v2.6.31-rc9, v2.6.31-rc8, v2.6.31-rc7, v2.6.31-rc6, v2.6.31-rc5, v2.6.31-rc4, v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1
# ae142e0c 12-Jun-2009 Christoph Hellwig <hch@lst.de>

powerpc/sputrace: Use the generic event tracer

I wrote sputrace before generic tracing infrastrucure was available.
Now that we have the generic event tracer we can convert it over and
remove a lot

powerpc/sputrace: Use the generic event tracer

I wrote sputrace before generic tracing infrastrucure was available.
Now that we have the generic event tracer we can convert it over and
remove a lot of code:

8 files changed, 45 insertions(+), 285 deletions(-)

To use it make sure CONFIG_EVENT_TRACING is enabled and then enable
the spufs trace channel by

echo 1 > /sys/kernel/debug/tracing/events/spufs/spufs_context/enable

and then read the trace records using e.g.

cat /sys/kernel/debug/tracing/trace

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

show more ...


# 7eef4091 16-Jun-2009 J. Bruce Fields <bfields@citi.umich.edu>

Merge commit 'v2.6.30' into for-2.6.31


# 4e73e0eb 11-Jun-2009 Felix Blyakher <felixb@sgi.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


Revision tags: v2.6.30
# 5f4457a4 07-Jun-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/cpu


Revision tags: v2.6.30-rc8
# ee073662 24-May-2009 H. Peter Anvin <hpa@zytor.com>

Merge branch 'x86/urgent' into x86/setup

Resolved conflicts:
arch/x86/boot/memory.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>


Revision tags: v2.6.30-rc7
# a2ab67fa 23-May-2009 Russell King <rmk@dyn-67.arm.linux.org.uk>

Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

Conflicts:
arch/arm/Kconfig
arch/arm/Makefile


# e4b63636 22-May-2009 Jens Axboe <jens.axboe@oracle.com>

Merge branch 'master' into for-2.6.31

Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>


# 521c1808 20-May-2009 Thomas Gleixner <tglx@linutronix.de>

Merge branch 'core/urgent' into core/futexes

Merge reason: this branch was on an pre -rc1 base, merge it up to -rc6+
to get the latest upstream fixes.

Conflicts:
kernel/futex.c

Sign

Merge branch 'core/urgent' into core/futexes

Merge reason: this branch was on an pre -rc1 base, merge it up to -rc6+
to get the latest upstream fixes.

Conflicts:
kernel/futex.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

show more ...


# bb803cfb 19-May-2009 David S. Miller <davem@davemloft.net>

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/scsi/fcoe/fcoe.c


# 74392592 17-May-2009 David S. Miller <davem@davemloft.net>

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/


1...<<111213141516171819