History log of /linux/arch/mips/include/asm/sn/nmi.h (Results 26 – 50 of 74)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2.6.30-rc8
# 3d58f48b 01-Jun-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into irq/numa

Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

Signed-

Merge branch 'linus' into irq/numa

Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

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

show more ...


# e93721a7 29-May-2009 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check


# 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>


# fc05505b 24-May-2009 Russell King <rmk@dyn-67.arm.linux.org.uk>

Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel


Revision tags: v2.6.30-rc7
# 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>


# 2c9e703c 22-May-2009 James Morris <jmorris@namei.org>

Merge branch 'master' into next

Conflicts:
fs/exec.c

Removed IMA changes (the IMA checks are now performed via may_open()).

Signed-off-by: James Morris <jmorris@namei.org>


# 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


# 1079cac0 18-May-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.30-rc6' into tracing/core

Merge reason: we were on an -rc4 base, sync up to -rc6

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


# b286e218 18-May-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.30-rc6' into x86/mm

Merge reason: sync up to -rc6 which has changes to mm/ which we are
going to touch in the commits to follow as well.

Signed-off-by: Ingo Molnar

Merge commit 'v2.6.30-rc6' into x86/mm

Merge reason: sync up to -rc6 which has changes to mm/ which we are
going to touch in the commits to follow as well.

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

show more ...


# dc3f81b1 18-May-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.30-rc6' into perfcounters/core

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

Signed-off-by: Ingo Molnar <ming

Merge commit 'v2.6.30-rc6' into perfcounters/core

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

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

show more ...


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

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


Revision tags: v2.6.30-rc6
# c48f2295 15-May-2009 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (38 commits)
MIPS: Sibyte: Fix locking in set_irq_affini

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (38 commits)
MIPS: Sibyte: Fix locking in set_irq_affinity
MIPS: Use force_sig when handling address errors.
MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read()
MIPS: Rewrite <asm/div64.h> to work with gcc 4.4.0.
MIPS: Fix highmem.
MIPS: Fix sign-extension bug in 32-bit kernel on 32-bit hardware.
MIPS: MSP71xx: Remove the RAMROOT functions
MIPS: Use -mno-check-zero-division
MIPS: Set compiler options only after the compiler prefix has ben set.
MIPS: IP27: Get rid of #ident. Gcc 4.4.0 doesn't like it.
MIPS: uaccess: Switch lock annotations to might_fault().
MIPS: MSP71xx: Resolve use of non-existent GPIO routines in msp71xx reset
MIPS: MSP71xx: Resolve multiple definition of plat_timer_setup
MIPS: Make uaccess.h slightly more sparse friendly.
MIPS: Make access_ok() sideeffect proof.
MIPS: IP27: Fix clash with NMI_OFFSET from hardirq.h
MIPS: Alchemy: Timer build fix
MIPS: Kconfig: Delete duplicate definition of RWSEM_GENERIC_SPINLOCK.
MIPS: Cavium: Add support for 8k and 32k page sizes.
MIPS: TXx9: Fix possible overflow in clock calculations
...

show more ...


Revision tags: v2.6.30-rc5, v2.6.30-rc4
# 165533c3 28-Apr-2009 Ralf Baechle <ralf@linux-mips.org>

MIPS: IP27: Get rid of #ident. Gcc 4.4.0 doesn't like it.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>


Revision tags: v2.6.30-rc3, v2.6.30-rc2, v2.6.30-rc1, v2.6.29, v2.6.29-rc8, v2.6.29-rc7, v2.6.29-rc6, v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3, v2.6.29-rc2, v2.6.29-rc1, v2.6.28
# 55fa5188 20-Dec-2008 Takashi Iwai <tiwai@suse.de>

Merge branch 'topic/pcsp-fix' into topic/misc


# 0ff55519 19-Dec-2008 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/hda' into topic/hda


Revision tags: v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7
# 7fbb8759 26-Nov-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc6' into core/debug


# 3e1d7a62 24-Nov-2008 Thomas Gleixner <tglx@linutronix.de>

Merge branch 'linus' into core/futexes


Revision tags: v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3
# 7b3b6e42 31-Oct-2008 Takashi Iwai <tiwai@suse.de>

Merge commit 'v2.6.28-rc2' into topic/asoc


# d1a76187 28-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into core/locking

Conflicts:
arch/um/include/asm/system.h


# 7a9787e1 28-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks


Revision tags: v2.6.28-rc2, v2.6.28-rc1
# b2aaf8f7 15-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h


# e21e696e 06-Nov-2008 James Morris <jmorris@namei.org>

Merge branch 'master' into next


# d9214556 23-Oct-2008 Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6


# 057316cc 23-Oct-2008 Len Brown <len.brown@intel.com>

Merge branch 'linus' into test

Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c

Signed-off-by: Le

Merge branch 'linus' into test

Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c

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

show more ...


123