History log of /linux/arch/powerpc/configs/mpc866_ads_defconfig (Results 251 – 275 of 499)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 9b8b317d 23-Nov-2009 J. Bruce Fields <bfields@citi.umich.edu>

Merge commit 'v2.6.32-rc8' into HEAD


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


# 260af562 18-Nov-2009 Paul Mundt <lethal@linux-sh.org>

Merge branch 'sh/stable-updates'


# a7b63425 17-Nov-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'perf/core' into perf/probes

Resolved merge conflict in tools/perf/Makefile

Merge reason: we want to queue up a dependent patch.

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


# bb9074ff 17-Nov-2009 Eric W. Biederman <ebiederm@xmission.com>

Merge commit 'v2.6.32-rc7'

Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.


# 99f4c9de 17-Nov-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.32-rc7' into core/iommu

Merge reason: Add fixes we'll depend on.

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


# 39dc78b6 15-Nov-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.32-rc7' into perf/core

Merge reason: pick up perf fixlets

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


Revision tags: v2.6.32-rc7
# 0526484a 12-Nov-2009 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin/master' into next


# e5d45abe 11-Nov-2009 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: pasemi_defconfig update
power

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: pasemi_defconfig update
powerpc: 2.6.32 update of defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx
powerpc/8xxx: enable IPsec ESP by default on mpc83xx/mpc85xx
powerpc/83xx: Fix u-boot partion size for MPC8377E-WLAN boards
powerpc/85xx: Fix USB GPIOs for MPC8569E-MDS boards
powerpc/82xx: kmalloc failure ignored in ep8248e_mdio_probe()
powerpc/85xx: sbc8548 - fixup of PCI-e related DTS fields

show more ...


# f74400ae 11-Nov-2009 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'kumar/merge' into merge


# e9bcf141 05-Nov-2009 Kumar Gala <galak@kernel.crashing.org>

powerpc: 2.6.32 update of defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx

Updated mpc85xx_{smp_}defconfig to enable:
* XES_MPC85xx board
* PCI MSI
* RapidIO

Signed-off-by: Kumar Gala <galak@kern

powerpc: 2.6.32 update of defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx

Updated mpc85xx_{smp_}defconfig to enable:
* XES_MPC85xx board
* PCI MSI
* RapidIO

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

show more ...


Revision tags: v2.6.32-rc6, v2.6.32-rc5, v2.6.32-rc4
# 907bc6c7 06-Oct-2009 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-2.6.32' into for-2.6.33


Revision tags: v2.6.32-rc3, v2.6.32-rc1, v2.6.32-rc2
# f0568783 23-Sep-2009 Anton Vorontsov <avorontsov@ru.mvista.com>

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

Conflicts:
drivers/power/wm97xx_battery.c


# 7cce2f4c 21-Sep-2009 Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

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

Conflicts:
fs/ubifs/super.c

Merge the upstream tree in order to resolve a conflict with th

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

Conflicts:
fs/ubifs/super.c

Merge the upstream tree in order to resolve a conflict with the
per-bdi writeback changes from the linux-2.6-block tree.

show more ...


# fc8e1ead 14-Sep-2009 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge branch 'next' into for-linus


# ddd559b1 12-Sep-2009 Russell King <rmk@dyn-67.arm.linux.org.uk>

Merge branch 'devel-stable' into devel

Conflicts:
MAINTAINERS
arch/arm/mm/fault.c


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

Merge commit 'md/for-linus' into async-tx-next

Conflicts:
drivers/md/raid5.c


# 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
# 695a4612 04-Sep-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu


# 936e894a 02-Sep-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.31-rc8' into x86/txt

Conflicts:
arch/x86/kernel/reboot.c
security/Kconfig

Merge reason: resolve the conflicts, bump up from rc3 to rc8.

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

Merge commit 'v2.6.31-rc8' into x86/txt

Conflicts:
arch/x86/kernel/reboot.c
security/Kconfig

Merge reason: resolve the conflicts, bump up from rc3 to rc8.

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

show more ...


# bbe69aa5 31-Aug-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.31-rc8' into core/locking

Merge reason: we were on -rc4, move to -rc8 before applying
a new batch of locking infrastructure changes.

Signed-off-by: Ingo Molnar <min

Merge commit 'v2.6.31-rc8' into core/locking

Merge reason: we were on -rc4, move to -rc8 before applying
a new batch of locking infrastructure changes.

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

show more ...


# eebc57f7 29-Aug-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6 into x86/apic

Merge reason: the SFI (Simple Firmware Interface) feature in the ACPI
tree nee

Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6 into x86/apic

Merge reason: the SFI (Simple Firmware Interface) feature in the ACPI
tree needs this cleanup, pull it into the APIC branch as
well so that there's no interactions.

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

show more ...


# 4b61bb57 28-Aug-2009 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge commit 'v2.6.31-rc8' into next


Revision tags: v2.6.31-rc8
# b855192c 27-Aug-2009 H. Peter Anvin <hpa@zytor.com>

Merge branch 'x86/urgent' into x86/pat

Reason: Change to is_new_memtype_allowed() in x86/urgent

Resolved semantic conflicts in:

arch/x86/mm/pat.c
arch/x86/mm/ioremap.c

Signed-off-by: H. Peter

Merge branch 'x86/urgent' into x86/pat

Reason: Change to is_new_memtype_allowed() in x86/urgent

Resolved semantic conflicts in:

arch/x86/mm/pat.c
arch/x86/mm/ioremap.c

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

show more ...


# e8a2eb47 26-Aug-2009 H. Peter Anvin <hpa@zytor.com>

Merge commit 'origin/x86/urgent' into x86/asm


1...<<11121314151617181920