History log of /openbmc/linux/arch/arm/mach-rpc/dma.c (Results 201 – 225 of 240)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 83bd6998 14-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc6' into timers/hpet


# fced80c7 06-Sep-2008 Russell King <rmk@dyn-67.arm.linux.org.uk>

[ARM] Convert asm/io.h to linux/io.h

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>


# 86d68898 27-Aug-2008 James Morris <jmorris@namei.org>

Merge branch 'master' into next


# 470fba7e 21-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/doc


# 170465ee 20-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/xen


# f3efbe58 15-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/gart


# 04197c83 15-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/tracehook

Conflicts:
arch/x86/Kconfig

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


# 1a103907 15-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/cpu


# 5aa37e4f 15-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'x86/core' into x86/apic


# 51ca3c67 14-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/core

Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h

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


# 8d7ccaa5 14-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc3' into x86/prototypes

Conflicts:

include/asm-x86/dma-mapping.h

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


# d4439087 14-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc3' into x86/xsave

Conflicts:

arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h

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


# a12e61df 13-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc3' into x86/urgent


# 251a169c 11-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into sched/urgent


# c4c0c56a 11-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/rcu


# 6de9c708 11-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/cleanups


# 8067794b 11-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/x2apic

Conflicts:

arch/x86/kernel/genapic_64.c

Manual merge:

arch/x86/kernel/genx2apic_uv_x.c

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


# cf206bff 11-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into sched/clock


# af7a5356 08-Aug-2008 Ben Dooks <ben-linux@fluff.org>

Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk


# 49b75b87 08-Aug-2008 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFI

Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB
[ARM] 5166/1: magician: add MAINTAINERS entry
[ARM] fix pnx4008 build errors
[ARM] Fix SMP booting with non-zero PHYS_OFFSET
[ARM] 5185/1: Fix spi num_chipselect for lubbock
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
[ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include
[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
[ARM] Eliminate useless includes of asm/mach-types.h
[ARM] Fix circular include dependency with IRQ headers
avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
avr32: Introduce arch/avr32/mach-*/include/mach
avr32: Move include/asm-avr32 to arch/avr32/include/asm
[ARM] sa1100_wdt: use reset_status to remember watchdog reset status
[ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
[ARM] pxa: introduce reset.h for reset specific header information

show more ...


Revision tags: v2.6.27-rc2
# a09e64fb 05-Aug-2008 Russell King <rmk@dyn-67.arm.linux.org.uk>

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

This just leaves include/asm-arm/plat-* to deal with.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>


# be509729 04-Aug-2008 Russell King <rmk@dyn-67.arm.linux.org.uk>

[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead

Remove includes of asm/hardware.h in addition to asm/arch/hardware.h.
Then, since asm/hardware.h only exists to include asm/arch/hardware

[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead

Remove includes of asm/hardware.h in addition to asm/arch/hardware.h.
Then, since asm/hardware.h only exists to include asm/arch/hardware.h,
update everything to directly include asm/arch/hardware.h and remove
asm/hardware.h.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

show more ...


Revision tags: v2.6.27-rc1, v2.6.26, v2.6.26-rc9, v2.6.26-rc8, v2.6.26-rc7, v2.6.26-rc6, v2.6.26-rc5, v2.6.26-rc4, v2.6.26-rc3, v2.6.26-rc2, v2.6.26-rc1, v2.6.25, v2.6.25-rc9, v2.6.25-rc8, v2.6.25-rc7, v2.6.25-rc6, v2.6.25-rc5, v2.6.25-rc4, v2.6.25-rc3, v2.6.25-rc2, v2.6.25-rc1, v2.6.24, v2.6.24-rc8, v2.6.24-rc7, v2.6.24-rc6, v2.6.24-rc5, v2.6.24-rc4, v2.6.24-rc3, v2.6.24-rc2, v2.6.24-rc1, v2.6.23, v2.6.23-rc9, v2.6.23-rc8, v2.6.23-rc7, v2.6.23-rc6, v2.6.23-rc5, v2.6.23-rc4, v2.6.23-rc3, v2.6.23-rc2, v2.6.23-rc1, v2.6.22, v2.6.22-rc7, v2.6.22-rc6, v2.6.22-rc5, v2.6.22-rc4, v2.6.22-rc3, v2.6.22-rc2, v2.6.22-rc1, v2.6.21, v2.6.21-rc7, v2.6.21-rc6, v2.6.21-rc5, v2.6.21-rc4, v2.6.21-rc3, v2.6.21-rc2, v2.6.21-rc1, v2.6.20, v2.6.20-rc7, v2.6.20-rc6, v2.6.20-rc5, v2.6.20-rc4, v2.6.20-rc3, v2.6.20-rc2, v2.6.20-rc1
# f0eef253 12-Dec-2006 Dave Jones <davej@redhat.com>

Merge ../linus


Revision tags: v2.6.19, v2.6.19-rc6, v2.6.19-rc5, v2.6.19-rc4, v2.6.19-rc3
# 513b046c 21-Oct-2006 David Woodhouse <dwmw2@infradead.org>

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


Revision tags: v2.6.19-rc2
# 701328a7 11-Oct-2006 Jeff Garzik <jeff@garzik.org>

Merge branch 'master' into upstream-fixes


12345678910