History log of /linux/arch/sh/kernel/cpu/sh2a/Makefile (Results 76 – 100 of 146)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 0ff55519 19-Dec-2008 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/hda' into topic/hda


# 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
# a5a64498 10-Nov-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc4' into timers/rtc

Conflicts:
drivers/rtc/rtc-cmos.c


Revision tags: 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


# 0a9b8638 27-Oct-2008 Takashi Iwai <tiwai@suse.de>

Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci-ioremap-bar' into for-linus


# 8c82a17e 24-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.28-rc1' into sched/urgent


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


# f20e3b5f 22-Oct-2008 Russell King <rmk@dyn-67.arm.linux.org.uk>

Merge branch 'for-rmk' of git://git.android.com/kernel into devel


# a02efb90 21-Oct-2008 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin' into master

Manual merge of:

arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h


# ed402af3 20-Oct-2008 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: (112 commits)
sh: Move SH-4 CPU headers down one more level.
sh:

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: (112 commits)
sh: Move SH-4 CPU headers down one more level.
sh: Only build in gpio.o when CONFIG_GENERIC_GPIO is selected.
sh: Migrate common board headers to mach-common/.
sh: Move the CPU definition headers from asm/ to cpu/.
serial: sh-sci: Add support SCIF of SH7723
video: add sh_mobile_lcdc platform flags
video: remove unused sh_mobile_lcdc platform data
sh: remove consistent alloc cruft
sh: add dynamic crash base address support
sh: reduce Migo-R smc91x overruns
sh: Fix up some merge damage.
Fix debugfs_create_file's error checking method for arch/sh/mm/
Fix debugfs_create_dir's error checking method for arch/sh/kernel/
sh: ap325rxa: Add support RTC RX-8564LC in AP325RXA board
sh: Use sh7720 GPIO on magicpanelr2 board
sh: Add sh7720 pinmux code
sh: Use sh7203 GPIO on rsk7203 board
sh: Add sh7203 pinmux code
sh: Use sh7723 GPIO on AP325RXA board
sh: Add sh7723 pinmux code
...

show more ...


# 79ed2a92 20-Oct-2008 Paul Mundt <lethal@linux-sh.org>

Merge branch 'sh/gpiolib'


Revision tags: v2.6.27
# 41e4a9a5 08-Oct-2008 Magnus Damm <damm@igel.co.jp>

sh: Add sh7203 pinmux code

This patch adds pinmux and gpio support for the sh7203 processor.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>


# accba5f3 13-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into oprofile-v2

Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h


Revision tags: v2.6.27-rc9
# f68ec0c2 03-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc8' into x86/setup


# d6d5aeb6 02-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.27-rc8' into genirq


Revision tags: v2.6.27-rc8
# ebdd90a8 24-Sep-2008 Ingo Molnar <mingo@elte.hu>

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


# 0b88641f 22-Sep-2008 Ingo Molnar <mingo@elte.hu>

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


Revision tags: v2.6.27-rc7, v2.6.27-rc6, v2.6.27-rc5
# 470fba7e 21-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/doc


Revision tags: v2.6.27-rc4
# 2879a927 19-Aug-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'x86/oprofile' into oprofile


123456