History log of /linux/arch/mips/alchemy/common/Makefile (Results 126 – 150 of 243)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2.6.36, v2.6.36-rc8
# 239060b9 12-Oct-2010 Michal Marek <mmarek@suse.cz>

Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.


Revision tags: v2.6.36-rc7, v2.6.36-rc6, v2.6.36-rc5, v2.6.36-rc4
# e199e613 09-Sep-2010 David S. Miller <davem@davemloft.net>

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


# daab7fc7 31-Aug-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.36-rc3' into x86/memblock

Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c

Merge reason: Resolve the conflicts, update to latest upstream.

Signed-off-by: Ingo Molnar <min

Merge commit 'v2.6.36-rc3' into x86/memblock

Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c

Merge reason: Resolve the conflicts, update to latest upstream.

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

show more ...


Revision tags: v2.6.36-rc3
# f632265d 26-Aug-2010 J. Bruce Fields <bfields@redhat.com>

Merge commit 'v2.6.36-rc1' into HEAD


Revision tags: v2.6.36-rc2
# e981b060 20-Aug-2010 Michal Marek <mmarek@suse.cz>

Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes


# c8710ad3 19-Aug-2010 Ingo Molnar <mingo@elte.hu>

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core


# 6ab561c8 18-Aug-2010 Takashi Iwai <tiwai@suse.de>

Merge branch 'topic/isa' into topic/misc


# e4862f2f 16-Aug-2010 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-2.6.36' into for-2.6.37

Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
arch/arm/mach-mx2/clock_imx27.c
arch

Merge branch 'for-2.6.36' into for-2.6.37

Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
arch/arm/mach-mx2/clock_imx27.c
arch/arm/mach-mx2/devices.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-zoom2.c
sound/soc/fsl/mpc5200_dma.c
sound/soc/fsl/mpc5200_dma.h
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/pxa/spitz.c

show more ...


# bbcf6e8b 16-Aug-2010 Paul Mundt <lethal@linux-sh.org>

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

Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile

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


Revision tags: v2.6.36-rc1
# 95ee46aa 15-Aug-2010 Len Brown <len.brown@intel.com>

Merge branch 'linus' into release

Conflicts:
drivers/acpi/debug.c

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


# f46a6804 12-Aug-2010 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into perf/urgent

Merge reason: Fix upstream breakage introduced by:

de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.

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


# fb8231a8 10-Aug-2010 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into for-next

Conflicts:
arch/arm/mach-omap1/board-nokia770.c


# fd8aa2c1 10-Aug-2010 NeilBrown <neilb@suse.de>

Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus


# 054d5c92 09-Aug-2010 Russell King <rmk+kernel@arm.linux.org.uk>

Merge branch 'devel-stable' into devel


# d9a145fb 09-Aug-2010 Frederic Weisbecker <fweisbec@gmail.com>

Merge commit 'linus/master' into bkl/core

Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.


# ab11b487 06-Aug-2010 Chris Metcalf <cmetcalf@tilera.com>

Merge branch 'master' into for-linus


# c3d1f174 05-Aug-2010 Linus Torvalds <torvalds@linux-foundation.org>

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

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)
MIPS: PowerTV: Separate PowerTV USB suppor

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

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)
MIPS: PowerTV: Separate PowerTV USB support from non-USB code
MIPS: strip the un-needed sections of vmlinuz
MIPS: Clean up the calculation of VMLINUZ_LOAD_ADDRESS
MIPS: Clean up arch/mips/boot/compressed/decompress.c
MIPS: Clean up arch/mips/boot/compressed/ld.script
MIPS: Unify the suffix of compressed vmlinux.bin
MIPS: PowerTV: Add Gaia platform definitions.
MIPS: BCM47xx: Fix nvram_getenv return value.
MIPS: Octeon: Allow more than 3.75GB of memory with PCIe
MIPS: Clean up notify_die() usage.
MIPS: Remove unused task_struct.trap_no field.
Documentation: Mention that KProbes is supported on MIPS
SAMPLES: kprobe_example: Make it print something on MIPS.
MIPS: kprobe: Add support.
MIPS: Add instrunction format for BREAK and SYSCALL
MIPS: kprobes: Define regs_return_value()
MIPS: Ritually kill stupid printk.
MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.
MIPS: Octeon: Support 256 MSI on PCIe
MIPS: Decode core number for R2 CPUs.
...

show more ...


Revision tags: v2.6.35, v2.6.35-rc6, v2.6.35-rc5, v2.6.35-rc4, v2.6.35-rc3, v2.6.35-rc2
# baf3eb23 01-Jun-2010 Manuel Lauss <manuel.lauss@googlemail.com>

MIPS: Move Alchemy Makefile parts to their own Platform file.

[Ralf: Remove a forgotten -Werror in Pb1200 Makefile.]

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: Linux-MIPS <linux-

MIPS: Move Alchemy Makefile parts to their own Platform file.

[Ralf: Remove a forgotten -Werror in Pb1200 Makefile.]

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: Linux-MIPS <linux-mips@linux-mips.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Manuel Lauss <manuel.lauss@googlemail.com>
Patchwork: https://patchwork.linux-mips.org/patch/1319/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

show more ...


# 7a996d3a 04-Aug-2010 Michal Marek <mmarek@suse.cz>

Merge commit 'v2.6.35' into kbuild/kconfig

Conflicts:
scripts/kconfig/Makefile


# 772320e8 04-Aug-2010 Michal Marek <mmarek@suse.cz>

Merge commit 'v2.6.35' into kbuild/kbuild

Conflicts:
arch/powerpc/Makefile


Revision tags: v2.6.35-rc1
# b65b3489 17-May-2010 Henrique de Moraes Holschuh <hmh@hmh.eng.br>

Merge mainline (v2.6.34-rc7)


Revision tags: v2.6.34
# a9aa1d02 12-May-2010 Frederic Weisbecker <fweisbec@gmail.com>

Merge commit 'v2.6.34-rc7' into perf/nmi

Merge reason: catch up with latest softlockup detector changes.


Revision tags: v2.6.34-rc7, v2.6.34-rc6
# d9c5841e 30-Apr-2010 H. Peter Anvin <hpa@zytor.com>

Merge branch 'x86/asm' into x86/atomic

Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers

Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/

Merge branch 'x86/asm' into x86/atomic

Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers

Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/alternative.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

show more ...


# a36bf32e 23-Apr-2010 Robert Richter <robert.richter@amd.com>

Merge commit 'v2.6.34-rc5' into oprofile/core


Revision tags: v2.6.34-rc5, v2.6.34-rc4
# 87d8a697 09-Apr-2010 David Woodhouse <David.Woodhouse@intel.com>

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


12345678910