History log of /openbmc/linux/arch/arm/mach-ep93xx/Kconfig (Results 226 – 250 of 356)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2.6.32-rc7
# 330f28f6 06-Nov-2009 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-2.6.32' into for-2.6.33


# 02cee689 06-Nov-2009 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge commit 'v2.6.32-rc6' into next


# 2058297d 03-Nov-2009 Jens Axboe <jens.axboe@oracle.com>

Merge branch 'for-linus' into for-2.6.33

Conflicts:
block/cfq-iosched.c

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


Revision tags: v2.6.32-rc6
# 9de09ace 29-Oct-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'tracing/urgent' into tracing/core

Merge reason: Pick up fixes and move base from -rc1 to -rc5.

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


# e343eb0d 27-Oct-2009 J. Bruce Fields <bfields@citi.umich.edu>

Merge commit 'v2.6.32-rc5' into for-2.6.33


# 0b9e31e9 25-Oct-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into sched/core

Conflicts:
fs/proc/array.c

Merge reason: resolve conflict and queue up dependent patch.

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


# 0f8f86c7 17-Oct-2009 Frederic Weisbecker <fweisbec@gmail.com>

Merge commit 'perf/core' into perf/hw-breakpoint

Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile

Merge reason: We need to be uptodate with the perf events

Merge commit 'perf/core' into perf/hw-breakpoint

Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.

show more ...


# bb3c3e80 17-Oct-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.32-rc5' into perf/probes

Conflicts:
kernel/trace/trace_event_profile.c

Merge reason: update to -rc5 and resolve conflict.

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


# 6b50f5c7 16-Oct-2009 Ingo Molnar <mingo@elte.hu>

Merge branches 'x86/mce' and 'x86/urgent' into perf/mce

Merge reason: Put all MCE changes into this branch, we are
queueing up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elt

Merge branches 'x86/mce' and 'x86/urgent' into perf/mce

Merge reason: Put all MCE changes into this branch, we are
queueing up a dependent patch.

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

show more ...


Revision tags: v2.6.32-rc5
# b226f744 15-Oct-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into perf/core

Merge reason: pick up tools/perf/ changes from upstream.

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


# 95019b48 12-Oct-2009 Paul Mundt <lethal@linux-sh.org>

Merge branch 'sh/stable-updates'


Revision tags: v2.6.32-rc4, v2.6.32-rc3, v2.6.32-rc1, v2.6.32-rc2, v2.6.31, v2.6.31-rc9, v2.6.31-rc8, v2.6.31-rc7
# f72222c7 18-Aug-2009 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into upstream/wm8711


Revision tags: v2.6.31-rc6, v2.6.31-rc5, v2.6.31-rc4, v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1
# eadb8a09 17-Jun-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into tracing/hw-breakpoints

Conflicts:
arch/x86/Kconfig
arch/x86/kernel/traps.c
arch/x86/power/cpu.c
arch/x86/power/cpu_32.c
kernel/Makefile

Semantic conflict:
arch/x86/k

Merge branch 'linus' into tracing/hw-breakpoints

Conflicts:
arch/x86/Kconfig
arch/x86/kernel/traps.c
arch/x86/power/cpu.c
arch/x86/power/cpu_32.c
kernel/Makefile

Semantic conflict:
arch/x86/kernel/hw_breakpoint.c

Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to
put_cpu() in arch/x86/kernel/hw_breakpoint.c.

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

show more ...


# 46557bef 17-Nov-2009 Dave Airlie <airlied@redhat.com>

Merge branch 'drm-core-next' of ../linux-2.6 into drm-next


# 7a53c7f5 03-Nov-2009 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge commit 'v2.6.32-rc5' into for-linus


# a0738a68 15-Oct-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/urgent

Merge reason: pull in latest, to be able to revert a patch there.

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


# 589bf8d5 12-Oct-2009 Linus Torvalds <torvalds@linux-foundation.org>

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
ARM: force dcache flush if dcache_dirty bit set
[ARM] pxa: workaround errata #37 by not

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
ARM: force dcache flush if dcache_dirty bit set
[ARM] pxa: workaround errata #37 by not using half turbo switching
[ARM] pxamci: fix printing gpio numbers in pxamci_probe
[ARM] pxa/csb726: adjust duplicate structure field initialization
ARM: Add kmap_atomic type debugging
ARM: boolean bit testing
ARM: update die() output
ARM: Dump code/mem oops lines with the appropriate log level
ARM: Dump memory and backtrace as one printk per line
ARM: 5756/1: ep93xx: introduce clk parent
ARM: 5754/1: ep93xx: update i2c support
ARM: 5753/1: ep93xx: remove old EP93XX_GPIO_* defines
ARM: 5729/1: ep93xx: define EP93XX_*_PHYS_BASE with macros
ARM: 5751/1: ep93xx/micro9: Add Micro9-Slim
ARM: 5750/1: ep93xx/micro9: Update platform code
ARM: 5749/1: ep93xx/micro9: Update maintainer
ARM: 5752/1: SA1100: fix building of h3100
ARM: 5748/1: bcmring: fix build warning messages
ARM: 5747/1: Fix the start_pg value in free_memmap()
ARM: 5746/1: Handle possible translation errors in ARMv6/v7 coherent_user_range
...

show more ...


# 7232344d 07-Oct-2009 Hubert Feurstein <hubert.feurstein@contec.at>

ARM: 5751/1: ep93xx/micro9: Add Micro9-Slim

Add Contec Micro9-Slim support

Cc: Ryan Mallon <ryan@bluewatersys.com>

Requires: 5750/1
Signed-off-by: Hubert Feurstein <hubert.feurstein@contec.at>
Ack

ARM: 5751/1: ep93xx/micro9: Add Micro9-Slim

Add Contec Micro9-Slim support

Cc: Ryan Mallon <ryan@bluewatersys.com>

Requires: 5750/1
Signed-off-by: Hubert Feurstein <hubert.feurstein@contec.at>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

show more ...


# 14636005 07-Oct-2009 Hubert Feurstein <hubert.feurstein@contec.at>

ARM: 5750/1: ep93xx/micro9: Update platform code

Update Contec Micro9 platform code

Cc: Ryan Mallon <ryan@bluewatersys.com>

Requires: 5749/1
Signed-off-by: Hubert Feurstein <hubert.feurstein@conte

ARM: 5750/1: ep93xx/micro9: Update platform code

Update Contec Micro9 platform code

Cc: Ryan Mallon <ryan@bluewatersys.com>

Requires: 5749/1
Signed-off-by: Hubert Feurstein <hubert.feurstein@contec.at>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

show more ...


# 1f8db4fc 05-Oct-2009 Hartley Sweeten <hartleys@visionengravers.com>

ARM: 5744/1: ep93xx: add remaining phys offset selections

This adds the missing Kconfig options for the first SDRAM bank address
on ep93xx boards.

Cc: Hubert Feurstein <(address hidden)>
Signed-off

ARM: 5744/1: ep93xx: add remaining phys offset selections

This adds the missing Kconfig options for the first SDRAM bank address
on ep93xx boards.

Cc: Hubert Feurstein <(address hidden)>
Signed-off-by: H Hartley Sweeten <(address hidden)>
Acked-by: Ryan Mallon <(address hidden)>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

show more ...


# fc8e1ead 13-Sep-2009 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge branch 'next' into for-linus


# bbb20089 08-Sep-2009 Dan Williams <dan.j.williams@intel.com>

Merge branch 'dmaengine' into async-tx-next

Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c


# a348a7e6 08-Sep-2009 Dan Williams <dan.j.williams@intel.com>

Merge commit 'v2.6.31-rc1' into dmaengine


# 8a517c51 23-Aug-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.31-rc7' into x86/cpu


# 08229de4 15-Aug-2009 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-2.6.32' into mxc

Conflicts:
sound/soc/Makefile


12345678910>>...15