From: Grant Likely <grant.likely@secretlab.ca>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev <linuxppc-dev@ozlabs.org>
Cc: Wolfgang Denk <wd@denx.de>
Subject: Please pull mpc5xxx & virtex merge branch
Date: Wed, 17 Jun 2009 01:22:31 -0600 [thread overview]
Message-ID: <fa686aa40906170022y703e31b3vfe6da5bfc633bf52@mail.gmail.com> (raw)
Hi Ben,
Here's the xilinxfb fix plus some outstanding 5xxx changes that I
didn't get to the first time around.
Cheers,
g.
The following changes since commit 313485175da221c388f6a8ecf4c30062ba9bea17:
Geert Uytterhoeven (1):
usb/ps3: Add missing annotations
are available in the git repository at:
git://git.secretlab.ca/git/linux-2.6 merge
Anton Vorontsov (1):
powerpc/5200: convert mpc52xx_psc_spi to use cs_control callback
Grant Likely (1):
fbdev/xilinxfb: Fix improper casting and tighen up probe path
Wolfgang Denk (1):
powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function
Wolfram Sang (2):
powerpc/5200: Update pcm030.dts to add i2c eeprom and delete cruft
powerpc/5121: make clock debug output more readable
arch/powerpc/boot/dts/pcm030.dts | 26 ++--------
arch/powerpc/include/asm/mpc52xx.h | 2 +-
arch/powerpc/include/asm/{mpc512x.h => mpc5xxx.h} | 10 ++--
arch/powerpc/platforms/512x/clock.c | 10 ++--
arch/powerpc/platforms/512x/mpc512x.h | 1 -
arch/powerpc/platforms/512x/mpc512x_shared.c | 23 --------
arch/powerpc/platforms/52xx/mpc52xx_common.c | 32 +-----------
arch/powerpc/sysdev/Makefile | 3 +
arch/powerpc/sysdev/mpc5xxx_clocks.c | 33 ++++++++++++
drivers/ata/pata_mpc52xx.c | 2 +-
drivers/i2c/busses/i2c-mpc.c | 2 +-
drivers/net/fec_mpc52xx.c | 2 +-
drivers/net/fec_mpc52xx_phy.c | 2 +-
drivers/serial/mpc52xx_uart.c | 5 +-
drivers/spi/mpc52xx_psc_spi.c | 22 +++-----
drivers/video/xilinxfb.c | 59 ++++++++-------------
drivers/watchdog/mpc5200_wdt.c | 2 +-
include/linux/fsl_devices.h | 4 --
18 files changed, 91 insertions(+), 149 deletions(-)
rename arch/powerpc/include/asm/{mpc512x.h => mpc5xxx.h} (65%)
create mode 100644 arch/powerpc/sysdev/mpc5xxx_clocks.c
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
reply other threads:[~2009-06-17 7:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fa686aa40906170022y703e31b3vfe6da5bfc633bf52@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=wd@denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).