History log of /linux/arch/powerpc/configs/mpc5200_defconfig (Results 201 – 225 of 475)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 24942c8e 16-Nov-2011 James Morris <jmorris@namei.org>

Merge branch 'master'; commit 'v3.2-rc2' into next


Revision tags: v3.2-rc2
# 2290c0d0 13-Nov-2011 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into for-next

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.


# 37bef8f9 11-Nov-2011 Paul Mundt <lethal@linux-sh.org>

Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus


# 41966710 08-Nov-2011 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-3.2' into for-3.3


Revision tags: v3.2-rc1
# d30cc16c 07-Nov-2011 Tony Lindgren <tony@atomide.com>

Merge branch 'fixes-modulesplit' into fixes


# 1197ab29 07-Nov-2011 Linus Torvalds <torvalds@linux-foundation.org>

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

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
powerpc/p3060qds: Add suppor

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

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
powerpc/p3060qds: Add support for P3060QDS board
powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX
powerpc/85xx: Make kexec to interate over online cpus
powerpc/fsl_booke: Fix comment in head_fsl_booke.S
powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices
powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver
powerpc/85xx: Add 'fsl,pq3-gpio' compatiable for GPIO driver
powerpc/86xx: Correct Gianfar support for GE boards
powerpc/cpm: Clear muram before it is in use.
drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager
powerpc/fsl_msi: add support for "msi-address-64" property
powerpc/85xx: Setup secondary cores PIR with hard SMP id
powerpc/fsl-booke: Fix settlbcam for 64-bit
powerpc/85xx: Adding DCSR node to dtsi device trees
powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards
powerpc/85xx: fix PHYS_64BIT selection for P1022DS
powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map
powerpc: respect mem= setting for early memory limit setup
powerpc: Update corenet64_smp_defconfig
powerpc: Update mpc85xx/corenet 32-bit defconfigs
...

Fix up trivial conflicts in:
- arch/powerpc/configs/40x/hcu4_defconfig
removed stale file, edited elsewhere
- arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:
added opal and gelic drivers vs added ePAPR driver
- drivers/tty/serial/8250.c
moved UPIO_TSI to powerpc vs removed UPIO_DWAPB support

show more ...


Revision tags: v3.1, v3.1-rc10, v3.1-rc9, v3.1-rc8, v3.1-rc7, v3.1-rc6, v3.1-rc5
# 40dc7e8b 02-Sep-2011 Timur Tabi <timur@freescale.com>

powerpc/5200: enable audio in the defconfig

Audio support for the MPC5200 exists, so enable it by default.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Wolfram Sang <w.sang@pengutronix

powerpc/5200: enable audio in the defconfig

Audio support for the MPC5200 exists, so enable it by default.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Anatolij Gustschin <agust@denx.de>

show more ...


Revision tags: v3.1-rc4, v3.1-rc3
# 94bd217e 17-Aug-2011 Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

Merge commit 'v3.1-rc2' into HEAD


Revision tags: v3.1-rc2, v3.1-rc1, v3.0, v3.0-rc7, v3.0-rc6, v3.0-rc5, v3.0-rc4, v3.0-rc3
# a61944c2 08-Jun-2011 Michal Marek <mmarek@suse.cz>

Merge commit 'v3.0-rc1' into kbuild/kconfig


# 2e483528 07-Jun-2011 Michal Marek <mmarek@suse.cz>

Merge commit 'v3.0-rc1' into kbuild/kbuild


Revision tags: v3.0-rc2, v3.0-rc1
# 6288cf1e 29-May-2011 Len Brown <len.brown@intel.com>

Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release


# ea77f7a2 26-May-2011 Eric Paris <eparis@redhat.com>

Merge commit 'v2.6.39' into 20110526

Conflicts:
lib/flex_array.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c


# b73077eb 24-May-2011 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge branch 'next' into for-linus


# 78fab4c0 20-May-2011 Grant Likely <grant.likely@secretlab.ca>

Merge commit 'v2.6.39' into spi/next


Revision tags: v2.6.39, v2.6.39-rc7, v2.6.39-rc6, v2.6.39-rc5
# 03351ff4 23-Apr-2011 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge commit 'v2.6.39-rc4' into next


# d4ab4e6a 19-Apr-2011 James Morris <jmorris@namei.org>

Merge branch 'master'; commit 'v2.6.39-rc3' into next


# 366a2382 23-May-2011 Jiri Kosina <jkosina@suse.cz>

Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus


# 6b7b8e48 18-May-2011 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into upstream.

This is sync with Linus' tree to receive KEY_IMAGES definition
that went in through input tree.


# a18f22a9 14-May-2011 Thomas Gleixner <tglx@linutronix.de>

Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource

Conflicts:
arch/ia64/kernel/cyclone.c
arch/mips/kernel/i8253.c
arch/x86/kernel/i8253.c

Rea

Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource

Conflicts:
arch/ia64/kernel/cyclone.c
arch/mips/kernel/i8253.c
arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

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

show more ...


# 020abf03 10-May-2011 Stefan Richter <stefanr@s5r6.in-berlin.de>

Merge tag 'v2.6.39-rc7'

in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.


# 4cb1f43c 07-May-2011 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.39-rc6' into x86/cleanups

Merge reason: move to a (much) newer upstream base.

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


# a3ea8e8f 02-May-2011 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/hda' into topic/hda


# 07f9479a 26-Apr-2011 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.


# 68d2cf25 19-Apr-2011 Ingo Molnar <mingo@elte.hu>

Merge branch 'perf/urgent' into perf/core

Merge reason: we'll be queueing up dependent changes.

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


Revision tags: v2.6.39-rc4
# d5381e42 18-Apr-2011 Mark Brown <broonie@opensource.wolfsonmicro.com>

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
sound/soc/codecs/wm8994.c


12345678910>>...19