History log of /linux/arch/mips/alchemy/common/Makefile (Results 151 – 175 of 243)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 3595be77 31-Mar-2010 Dave Airlie <airlied@redhat.com>

Merge branch 'v2.6.34-rc2' into drm-linus


Revision tags: v2.6.34-rc3
# 329f9052 26-Mar-2010 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/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch w

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

Conflicts:
drivers/mtd/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().

show more ...


# 2fb20b61 22-Mar-2010 Takashi Iwai <tiwai@suse.de>

Merge branch 'topic/misc' into topic/usb


Revision tags: v2.6.34-rc2
# ec28dcc6 15-Mar-2010 Len Brown <len.brown@intel.com>

Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'vi

Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release

show more ...


# fad837c1 10-Mar-2010 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge commit 'v2.6.34-rc1' into for-2.6.35


# e739cf1d 09-Mar-2010 J. Bruce Fields <bfields@citi.umich.edu>

Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming


# 548b8416 09-Mar-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.34-rc1' into perf/urgent

Conflicts:
tools/perf/util/probe-event.c

Merge reason: Pick up -rc1 and resolve the conflict as well.

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


# ce67eef6 09-Mar-2010 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge commit 'v2.6.34-rc1' into for-linus


# 988addf8 08-Mar-2010 Russell King <rmk+kernel@arm.linux.org.uk>

Merge branch 'origin' into devel-stable

Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c


Revision tags: v2.6.34-rc1
# f790c0ca 08-Mar-2010 Patrick McHardy <kaber@trash.net>

Merge branch 'master' of /repos/git/linux-2.6

Conflicts:
net/ipv4/netfilter/nf_nat_core.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c

Signed-off-by: Patrick McHardy <k

Merge branch 'master' of /repos/git/linux-2.6

Conflicts:
net/ipv4/netfilter/nf_nat_core.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

show more ...


# 3fa04ecd 05-Mar-2010 Trond Myklebust <Trond.Myklebust@netapp.com>

Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34


# e02c4fd3 04-Mar-2010 Ingo Molnar <mingo@elte.hu>

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


# d702d121 01-Mar-2010 Tony Lindgren <tony@atomide.com>

Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
arch/arm/plat-omap/Kconfig


# e2f4699a 01-Mar-2010 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/rcu

Merge reason: Backmerge latest upstream to queue up dependent fix in the
scheduler.

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


# 47871889 01-Mar-2010 David S. Miller <davem@davemloft.net>

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
drivers/firmware/iscsi_ibft.c


# f1dd6ad5 28-Feb-2010 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: (141 commits)
MIPS: Alchemy: defconfig updates
MIPS: A

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (141 commits)
MIPS: Alchemy: defconfig updates
MIPS: Alchemy: Fix Au1100 ethernet build failure
MIPS: Alchemy: Repair db1500/bosporus builds
MIPS: ARC: Cleanup unused definitions from sgialib.h
MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses
MIPS: Alchemy: use 36bit addresses for PCMCIA resources.
MIPS: Cobalt: Fix theoretical port aliasing issue
MIPS: Use ALIGN(x, bytes) instead of __ALIGN_MASK(x, bytes - 1)
MIPS: Crazy spinlock speed test.
MIPS: Optimize spinlocks.
MIPS: Alchemy: devboard PM needs to save CPLD registers.
MIPS: PowerTV: Eliminate duplicate opcode definition macros
MIPS: Lemote 2F: Move printks out of port_access_lock.
MIPS: PNX833x: Convert IRQ controller locks to raw spinlocks.
MIPS: Octeon: Replace spinlock with raw_spinlocks in dma-octeon.c.
MIPS: Octeon: Replace rwlocks in irq_chip handlers with raw_spinlocks.
MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.
MIPS: Loongson: Remove pointless sample_lock from oprofile code.
MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock.
MIPS: i8259: Convert IRQ controller lock to raw spinlock.
...

show more ...


Revision tags: v2.6.33, v2.6.33-rc8, v2.6.33-rc7, v2.6.33-rc6, v2.6.33-rc5, v2.6.33-rc4, v2.6.33-rc3, v2.6.33-rc2, v2.6.33-rc1
# 32fd6901 08-Dec-2009 Manuel Lauss <manuel.lauss@googlemail.com>

MIPS: Alchemy: get rid of common/reset.c

Implement reset / poweroff in the board code instead. The peripheral reset
code is gone too since YAMON which all in-tree boards use does the same
work when

MIPS: Alchemy: get rid of common/reset.c

Implement reset / poweroff in the board code instead. The peripheral reset
code is gone too since YAMON which all in-tree boards use does the same
work when it boots.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/783/
Patchwork: http://patchwork.linux-mips.org/patch/882/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

show more ...


Revision tags: v2.6.32
# 5d400f5c 23-Nov-2009 Manuel Lauss <manuel.lauss@googlemail.com>

MIPS: Alchemy: Only build AU1000 INTC code for compatible cpus

Use the GPIO config symbol to only build Au1000 interrupt code on chips with
compatible hw.

Signed-off-by: Manuel Lauss <manuel.lauss@

MIPS: Alchemy: Only build AU1000 INTC code for compatible cpus

Use the GPIO config symbol to only build Au1000 interrupt code on chips with
compatible hw.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/670/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

show more ...


Revision tags: v2.6.32-rc8, v2.6.32-rc7, v2.6.32-rc6, v2.6.32-rc5
# 8402a158 15-Oct-2009 Manuel Lauss <manuel.lauss@googlemail.com>

MIPS: Alchemy: prom_putchar is board dependent

This patch replaces the general alchemy prom_putchar() implementation
in favor of board-specific versions: The UART where the output of
prom_putchar i

MIPS: Alchemy: prom_putchar is board dependent

This patch replaces the general alchemy prom_putchar() implementation
in favor of board-specific versions: The UART where the output of
prom_putchar is directed to really depends on the board, the current
implementation hardcodes this on a per-SoC basis which is just wrong.

So a generic uart tx function is provided in the alchemy headers,
and the boards can provide their own prom_putchar with custom
destination uart, and all in-kernel alchemy boards support
early printk.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

show more ...


Revision tags: v2.6.32-rc4, v2.6.32-rc3, v2.6.32-rc1, v2.6.32-rc2
# fc8e1ead 14-Sep-2009 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge branch 'next' into for-linus


Revision tags: v2.6.31
# bbb20089 09-Sep-2009 Dan Williams <dan.j.williams@intel.com>

Merge branch 'dmaengine' into async-tx-next

Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c


# a348a7e6 08-Sep-2009 Dan Williams <dan.j.williams@intel.com>

Merge commit 'v2.6.31-rc1' into dmaengine


# a1922ed6 07-Sep-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Si

Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

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

show more ...


Revision tags: v2.6.31-rc9, v2.6.31-rc8
# 8a517c51 23-Aug-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.31-rc7' into x86/cpu


Revision tags: v2.6.31-rc7
# f72222c7 18-Aug-2009 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into upstream/wm8711


12345678910