History log of /openbmc/linux/arch/mips/sgi-ip22/ip22-platform.c (Results 126 – 150 of 184)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 0b88641f 22-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc7' into x86/debug


# ab2b4951 21-Sep-2008 James Morris <jmorris@namei.org>

Merge branch 'master' into next

Conflicts:

MAINTAINERS

Thanks for breaking my tree :-)

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


# 5e51900b 19-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc6' into x86/cleanups


# 2e57572a 16-Sep-2008 David S. Miller <davem@davemloft.net>

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

Conflicts:

arch/sparc64/kernel/pci_psycho.c


# e3bbaa3c 16-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc6' into x86/memory-corruption-check


# 83bd6998 14-Sep-2008 Ingo Molnar <mingo@elte.hu>

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


# f81b691a 14-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc6' into x86/pat


# 9dfed08e 14-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc6' into core/resources


# 09b22a2f 11-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc6' into sched/devel


# 6ef62164 11-Sep-2008 Ingo Molnar <mingo@elte.hu>

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


# 3ce9bcb5 10-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'core/xen' into x86/xen


# 59c37bf8 10-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect

Conflicts:
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/feature_names.c
includ

Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect

Conflicts:
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h

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

show more ...


# e92b4fda 10-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc6' into x86/iommu


# 429b022a 10-Sep-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc6' into core/rcu


# 7e392f8c 09-Sep-2008 Paul Mackerras <paulus@samba.org>

Merge branch 'linux-2.6'


# 0b1fc335 09-Sep-2008 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:
[MIPS] IP22: Fix detection of second HPC3 on Challenge S


# 4a911b1e 04-Sep-2008 Thomas Bogendoerfer <tsbogend@alpha.franken.de>

[MIPS] IP22: Fix detection of second HPC3 on Challenge S

The second HPC3 could be found only on Guiness systems (Challenge-S),
but not on fullhouse (Indigo2) systems.

Signed-off-by: Thomas Bogendoe

[MIPS] IP22: Fix detection of second HPC3 on Challenge S

The second HPC3 could be found only on Guiness systems (Challenge-S),
but not on fullhouse (Indigo2) systems.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

show more ...


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

Merge branch 'linus' into core/rcu


# 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


# 85e9ca33 31-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into timers/hpet


# bc588df7 30-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'x86/core' into x86/xsave


# 9fec6060 29-Jul-2008 Anton Vorontsov <cbouatmailru@gmail.com>

Merge branch 'master' of /home/cbou/linux-2.6

Conflicts:

drivers/power/Kconfig
drivers/power/Makefile


# cb28a1bb 28-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

arch/x86/Kconfig

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


# eda3d8f5 27-Jul-2008 Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Merge commit 'upstream/master'


# ff877ea8 25-Jul-2008 David Woodhouse <David.Woodhouse@intel.com>

Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6


12345678