History log of /linux/arch/sh/boot/.gitignore (Results 51 – 75 of 79)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# bfefb7a0 20-Sep-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/urgent

Merge reason: Bring in changes that the next patch will depend on.

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


# 6469f540 20-Sep-2009 David Woodhouse <David.Woodhouse@intel.com>

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

Conflicts:
drivers/mtd/mtdcore.c

Merged in order that I can apply the Nomadik nand/onenand support patches.


# c602c65b 19-Sep-2009 Len Brown <len.brown@intel.com>

Merge branch 'linus' into sfi-release

Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c

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


# 71fd68e7 19-Sep-2009 Len Brown <len.brown@intel.com>

Merge branch 'linus' into release


# 515b696b 18-Sep-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: (262 commits)
sh: mach-ecovec24: Add user debug switch support
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: (262 commits)
sh: mach-ecovec24: Add user debug switch support
sh: Kill off unused se_skipped in alignment trap notification code.
sh: Wire up HAVE_SYSCALL_TRACEPOINTS.
video: sh_mobile_lcdcfb: use both register sets for display panning
video: sh_mobile_lcdcfb: implement display panning
sh: Fix up sh7705 flush_dcache_page() build.
sh: kfr2r09: document the PLL/FLL <-> RF relationship.
sh: mach-ecovec24: need asm/clock.h.
sh: mach-ecovec24: deassert usb irq on boot.
sh: Add KEYSC support for EcoVec24
sh: add kycr2_delay for sh_keysc
sh: cpufreq: Include CPU id in info messages.
sh: multi-evt support for SH-X3 proto CPU.
sh: clkfwk: remove bogus set_bus_parent() from SH7709.
sh: Fix the indication point of the liquid crystal of AP-325RXA(AP3300)
sh: Add EcoVec24 romImage defconfig
sh: USB disable process is needed if romImage boot for EcoVec24
sh: EcoVec24: add HIZA setting for LED
sh: EcoVec24: write MAC address in boot
sh: Add romImage support for EcoVec24
...

show more ...


Revision tags: v2.6.31, v2.6.31-rc9, v2.6.31-rc8
# 0858d9c0 23-Aug-2009 Paul Mundt <lethal@linux-sh.org>

Merge branch 'sh/hwblk' into sh/pm-runtime


Revision tags: v2.6.31-rc7, v2.6.31-rc6, v2.6.31-rc5, v2.6.31-rc4
# fc6cca39 21-Jul-2009 Paul Mundt <lethal@linux-sh.org>

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


# ef9b542f 21-Jul-2009 Paul Mundt <lethal@linux-sh.org>

sh: bzip2/lzma uImage support.

This builds on the bzip2/lzma zImage support change and wires it up for
uImages. Based on the blackfin implementation.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>


Revision tags: v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1, v2.6.30, v2.6.30-rc8, v2.6.30-rc7, v2.6.30-rc6, v2.6.30-rc5, v2.6.30-rc4, 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
# a9de18eb 31-Dec-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/include/asm/pda.h
kernel/fork.c


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


# 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


Revision tags: v2.6.28-rc2
# 8c82a17e 24-Oct-2008 Ingo Molnar <mingo@elte.hu>

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


Revision tags: v2.6.28-rc1
# 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 ...


1234