History log of /linux/arch/powerpc/configs/mpc866_ads_defconfig (Results 176 – 200 of 499)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# ad56b079 13-May-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.34-rc7' into tracing/core

Merge reason: Update from -rc5 to -rc7.

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


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


# 278554bd 12-May-2010 David S. Miller <davem@davemloft.net>

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

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_t

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

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c

show more ...


Revision tags: v2.6.34-rc7
# 34dc4d44 07-May-2010 Eric Anholt <eric@anholt.net>

Merge remote branch 'origin/master' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/radeon/r300.c

The BSD ringbuffer support that i

Merge remote branch 'origin/master' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/radeon/r300.c

The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.

show more ...


# 0ae28a35 10-May-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/mtdcore.c

Pull in the bdi fixes and ARM platform changes that other outstanding
pat

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

Conflicts:
drivers/mtd/mtdcore.c

Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.

show more ...


# dbb6be6d 10-May-2010 Thomas Gleixner <tglx@linutronix.de>

Merge branch 'linus' into timers/core

Reason: Further posix_cpu_timer patches depend on mainline changes

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


# 7c224a03 10-May-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.34-rc7' into oprofile

Merge reason: Update to Linus's latest -rc.

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


# d7be0ce6 08-May-2010 H. Peter Anvin <hpa@zytor.com>

Merge commit 'v2.6.34-rc6' into x86/cpu


# 48652ced 07-May-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.34-rc6' into sched/core


# 1468cf05 07-May-2010 Len Brown <len.brown@intel.com>

Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', 'bugzilla-15903' and 'misc-2.6.34' into release


# 1ed31d6d 07-May-2010 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin/master' into next


# 0ffbe269 06-May-2010 James Morris <jmorris@namei.org>

Merge branch 'master' into next


# 5306293c 04-May-2010 J. Bruce Fields <bfields@citi.umich.edu>

Merge commit 'v2.6.34-rc6'

Conflicts:
fs/nfsd/nfs4callback.c


# 53ba4f2f 03-May-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.34-rc6' into core/locking


# df2071bd 03-May-2010 Herbert Xu <herbert@gondor.apana.org.au>

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


# 868c522b 30-Apr-2010 Frederic Weisbecker <fweisbec@gmail.com>

Merge commit 'v2.6.34-rc6' into core/locking

Merge reason: Further lockdep patches depend on per cpu updates
made in -rc1.


# 3ca50496 30-Apr-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.34-rc6' into perf/core

Merge reason: update to the latest -rc.

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


Revision tags: v2.6.34-rc6
# 553cbf0a 30-Apr-2010 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/ps3: Update ps3_defconfig
powe

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/ps3: Update ps3_defconfig
powerpc/ps3: Update platform maintainer
powerpc/pseries: Flush lazy kernel mappings after unplug operations
powerpc/numa: Add form 1 NUMA affinity
powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32
powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx
powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED
powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig
powerpc/83xx: enable EPOLL syscall in defconfig
powerpc/83xx: add RTC drivers in 83xx defconfig
powerpc/fsl-cpm: Configure clock correctly for SCC
powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS
powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n

show more ...


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


# b4d0a038 20-Apr-2010 Kumar Gala <galak@kernel.crashing.org>

powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>


Revision tags: v2.6.34-rc5
# e3c8a027 16-Apr-2010 Kim Phillips <kim.phillips@freescale.com>

powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED

a recent fc11 udev update on an 83xx board made root console login
disappear:

Updating : udev-141-8.fc11.ppc

powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED

a recent fc11 udev update on an 83xx board made root console login
disappear:

Updating : udev-141-8.fc11.ppc 32/83
udev: starting version 141
udev: deprecated sysfs layout; update the kernel or disable CONFIG_SYSFS_DEPRECATED;
some udev features will not work correctly

and sure enough, turning off SYSFS_DEPRECATED brings the login prompt back.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

show more ...


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


Revision tags: v2.6.34-rc3, 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 ...


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.


12345678910>>...20