History log of /linux/arch/powerpc/configs/52xx/cm5200_defconfig (Results 226 – 250 of 388)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# acc6a093 10-Mar-2010 Grant Likely <grant.likely@secretlab.ca>

powerpc/52xx: update defconfigs

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>


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


# 4ea41e2d 04-Mar-2010 J. Bruce Fields <bfields@citi.umich.edu>

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming

Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.


# 35858adb 01-Mar-2010 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge branch 'next' into for-linus


# a7790532 26-Feb-2010 David Woodhouse <David.Woodhouse@intel.com>

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

The SmartMedia FTL code depends on new kfifo bits from 2.6.33


# 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


# 03806fa2 25-Feb-2010 David Vrabel <david.vrabel@csr.com>

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


# 109d2815 24-Feb-2010 Stefan Richter <stefanr@s5r6.in-berlin.de>

Merge tag 'v2.6.33' for its firewire changes since last branch point

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>


Revision tags: v2.6.33
# d02e30c3 23-Feb-2010 H. Peter Anvin <hpa@zytor.com>

Merge branch 'x86/irq' into x86/apic

Merge reason:
Conflicts in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
arch/x86/kernel/apic/io_apic.c

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


# f11cbd74 22-Feb-2010 Jens Axboe <jens.axboe@oracle.com>

Merge branch 'master' into for-2.6.34


# 7fb3a069 17-Feb-2010 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/misc' into topic/misc

Conflicts:
sound/pci/hda/patch_realtek.c


# 56012808 15-Feb-2010 Russell King <rmk+kernel@arm.linux.org.uk>

Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable

Conflicts:
arch/arm/Makefile


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

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


# 9ab99d5a 10-Feb-2010 Patrick McHardy <kaber@trash.net>

Merge branch 'master' of /repos/git/net-next-2.6

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


Revision tags: v2.6.33-rc7
# ab386128 02-Feb-2010 Tejun Heo <tj@kernel.org>

Merge branch 'master' into percpu


Revision tags: v2.6.33-rc6
# f1487fcb 25-Jan-2010 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-2.6.33' into for-2.6.34


# 51c24aaa 23-Jan-2010 David S. Miller <davem@davemloft.net>

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


# 7755726f 22-Jan-2010 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge commit 'v2.6.33-rc5' into next


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

Merge branch 'master' into percpu

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


# 398007f8 26-Feb-2010 Alex Elder <aelder@sgi.com>

Merge branch 'linux-2.6.33'


# 64b9fb57 26-Feb-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.33' into tracing/core

Conflicts:
scripts/recordmcount.pl

Merge reason: Merge up to v2.6.33.

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


# 996de8c6 25-Feb-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.33' into core/rcu

Merge reason: Update from -rc4 to -final.

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


# 8c2fcadc 18-Feb-2010 David S. Miller <davem@davemloft.net>

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


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


# 6d3e0907 08-Feb-2010 Ingo Molnar <mingo@elte.hu>

Merge branch 'sched/urgent' into sched/core

Merge reason: Merge dependent fix, update to latest -rc.

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


12345678910>>...16