History log of /linux/arch/sh/configs/sh7785lcr_defconfig (Results 201 – 225 of 324)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 0d595972 11-Jun-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/mce3

Conflicts:
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/irq.c

Merge reason: Resolve the conflicts above.

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


# d3d07d94 11-Jun-2009 Linus Torvalds <torvalds@linux-foundation.org>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (266 commits)
sh: Tie sparseirq in to Kconfig.
sh: Wire up sys_rt

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (266 commits)
sh: Tie sparseirq in to Kconfig.
sh: Wire up sys_rt_tgsigqueueinfo.
sh: Fix sys_pwritev() syscall table entry for sh32.
sh: Fix sh4a llsc-based cmpxchg()
sh: sh7724: Add JPU support
sh: sh7724: INTC setting update
sh: sh7722 clock framework rewrite
sh: sh7366 clock framework rewrite
sh: sh7343 clock framework rewrite
sh: sh7724 clock framework rewrite V3
sh: sh7723 clock framework rewrite V2
sh: add enable()/disable()/set_rate() to div6 code
sh: add AP325RXA mode pin configuration
sh: add Migo-R mode pin configuration
sh: sh7722 mode pin definitions
sh: sh7724 mode pin comments
sh: sh7723 mode pin V2
sh: rework mode pin code
sh: clock div6 helper code
sh: clock div4 frequency table offset fix
...

show more ...


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


# 5f8371ce 22-May-2009 Paul Mundt <lethal@linux-sh.org>

Merge branches 'sh/stable-updates' and 'sh/sparseirq'


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


Revision tags: v2.6.30-rc6
# 41fb454e 11-May-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.30-rc5' into core/iommu

Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.

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


# 7961386f 11-May-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.30-rc5' into sched/core

Merge reason: sched/core was on .30-rc1 before, update to latest fixes

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


# 7a309490 11-May-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.30-rc5' into x86/apic

Merge reason: this branch was on a .30-rc2 base - sync it up with
all the latest fixes.

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


# 134cbf35 11-May-2009 Ingo Molnar <mingo@elte.hu>

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

Merge reason: this branch was on a .30-rc2 base - sync it up with
all the latest fixes.

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


# d585a021 09-May-2009 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge commit 'v2.6.30-rc5' into next


Revision tags: v2.6.30-rc5
# f066a155 08-May-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'x86/urgent' into x86/xen

Conflicts:
arch/frv/include/asm/pgtable.h
arch/x86/include/asm/required-features.h
arch/x86/xen/mmu.c

Merge reason: x86/xen was on a .29 base still, move i

Merge branch 'x86/urgent' into x86/xen

Conflicts:
arch/frv/include/asm/pgtable.h
arch/x86/include/asm/required-features.h
arch/x86/xen/mmu.c

Merge reason: x86/xen was on a .29 base still, move it to a fresher
branch and pick up Xen fixes as well, plus resolve
conflicts

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

show more ...


# d2541170 08-May-2009 James Morris <jmorris@namei.org>

Merge branch 'master' into next


# 44347d94 07-May-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.

Signed-off-by:

Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.

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

show more ...


# f3831a59 05-May-2009 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge commit 'takashi/topic/asoc' into for-2.6.31


# 8560b932 04-May-2009 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/asoc' into topic/asoc


# 3a20ac2c 04-May-2009 Takashi Iwai <tiwai@suse.de>

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


# 912bc6ae 30-Apr-2009 Steve French <sfrench@us.ibm.com>

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


Revision tags: v2.6.30-rc4
# e7fd5d4b 29-Apr-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into perfcounters/core

Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.

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

Merge branch 'linus' into perfcounters/core

Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.

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

show more ...


# f70616ac 27-Apr-2009 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix up unsigned sy

Merge branch 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix up unsigned syscall_nr in SH-5 pt_regs.
maple: input: fix up maple mouse driver
sh: sh7785lcr: fix defconfig for 29-bit mode

show more ...


12345678910>>...13