History log of /openbmc/linux/arch/arm/mach-ep93xx/Kconfig (Results 201 – 225 of 356)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 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


# ac0f6f92 01-Mar-2010 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
ARM: Eliminate decompressor -Dstatic= PIC hack
ARM

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
ARM: Eliminate decompressor -Dstatic= PIC hack
ARM: 5958/1: ARM: U300: fix inverted clk round rate
ARM: 5956/1: misplaced parentheses
ARM: 5955/1: ep93xx: move timer defines into core.c and document
ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
ARM: 5953/1: ep93xx: fix broken build of clock.c
ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
ARM: 5949/1: NUC900 add gpio virtual memory map
ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
ARM: make_coherent(): fix problems with highpte, part 2
MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
ARM: 5945/1: ep93xx: include correct irq.h in core.c
ARM: 5933/1: amba-pl011: support hardware flow control
ARM: 5930/1: Add PKMAP area description to memory.txt.
ARM: 5929/1: Add checks to detect overlap of memory regions.
ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
ARM: 5927/1: Make delimiters of DMA area globally visibly.
ARM: 5926/1: Add "Virtual kernel memory..." printout.
ARM: 5920/1: OMAP4: Enable L2 Cache
...

Fix up trivial conflict in arch/arm/mach-mx25/clock.c

show more ...


# 3560adf6 25-Feb-2010 Russell King <rmk+kernel@arm.linux.org.uk>

Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel


Revision tags: v2.6.33
# b7e56edb 17-Feb-2010 Thomas Gleixner <tglx@linutronix.de>

Merge branch 'linus' into x86/mm

x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.

Signed-off-by: Thomas Gleixner <tglx@linutronix

Merge branch 'linus' into x86/mm

x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

show more ...


# dd2ac961 14-Feb-2010 Ryan Mallon <ryan@bluewatersys.com>

ARM: 5937/1: Add support for EP9315 based Snapper CL15 board

Add support for Bluewater Systems EP9315 based Snapper CL15 single board
computer module.

Signed-off-by: Ryan Mallon <ryan@bluewatersys.

ARM: 5937/1: Add support for EP9315 based Snapper CL15 board

Add support for Bluewater Systems EP9315 based Snapper CL15 single board
computer module.

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Acked-by: Hartley Sweeten <hartleys@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

show more ...


Revision tags: v2.6.33-rc8
# 84abd88a 10-Feb-2010 H. Peter Anvin <hpa@zytor.com>

Merge remote branch 'linus/master' into x86/bootmem


Revision tags: v2.6.33-rc7, v2.6.33-rc6
# a3662f6b 21-Jan-2010 Ryan Mallon <ryan@bluewatersys.com>

ARM: 5892/1: ep93xx: Add support for Simplemachines Sim.One board

Add support for the Simplemachines EP9307 based Sim.One board.

Cc: Hartley Sweeten <hartleys@visionengravers.com>
Cc: Sergio Sorren

ARM: 5892/1: ep93xx: Add support for Simplemachines Sim.One board

Add support for the Simplemachines EP9307 based Sim.One board.

Cc: Hartley Sweeten <hartleys@visionengravers.com>
Cc: Sergio Sorrenti <sergio.sorrenti@gmail.com>
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Acked-by: Hartley Sweeten <hartleys@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

show more ...


Revision tags: v2.6.33-rc5, v2.6.33-rc4, v2.6.33-rc3
# 32032df6 04-Jan-2010 Tejun Heo <tj@kernel.org>

Merge branch 'master' into percpu

Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h


Revision tags: v2.6.33-rc2
# de8853bc 21-Dec-2009 Takashi Iwai <tiwai@suse.de>

Merge remote branch 'alsa/fixes' into fix/hda


Revision tags: v2.6.33-rc1
# 559300bc 14-Dec-2009 Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Merge commit 'v2.6.32'

Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h


# ec208491 08-Dec-2009 David Woodhouse <David.Woodhouse@intel.com>

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

Merge the BIOS workarounds from 2.6.32, and the swiotlb fallback on failure.


# 6548698f 07-Dec-2009 Frederic Weisbecker <fweisbec@gmail.com>

Merge commit 'v2.6.32' into reiserfs/kill-bkl

Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchm

Merge commit 'v2.6.32' into reiserfs/kill-bkl

Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchmarking results closer to the lastest kernel behaviour.

show more ...


# c84d6efd 03-Dec-2009 James Morris <jmorris@macbook.(none)>

Merge branch 'master' into next


Revision tags: v2.6.32
# 83863243 01-Dec-2009 Herbert Xu <herbert@gondor.apana.org.au>

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


# 2cfcadde 23-Nov-2009 Grant Likely <grant.likely@secretlab.ca>

Merge commit 'v2.6.32-rc8'


Revision tags: v2.6.32-rc8
# 3505d1a9 19-Nov-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/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/stagin

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

Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig

show more ...


# 0c3c35e1 14-Nov-2009 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/misc' into topic/misc


12345678910>>...15