From: Paul Mundt on
This is a resend of the pull request for 2.6.34-rc6 with the addition of
an lcdcfb patch. It hasn't been rebased, so if you've already pulled the
previous changes then you should just get that patch.

Please pull from: sh/for-2.6.34

Which contains:

Guennadi Liakhovetski (3):
SH: fix TS field shift calculation for DMA drivers
SH: fix error paths in DMA driver
sh: fix a number of Oopses and leaks in SH framebuffer driver

Magnus Damm (2):
sh: Fix maximum number of SCIF ports in R2D defconfigs
sh: sh7751 pci controller io port fix

arch/sh/configs/rts7751r2d1_defconfig | 2 +-
arch/sh/configs/rts7751r2dplus_defconfig | 2 +-
arch/sh/drivers/pci/pci-sh7751.c | 5 +++--
arch/sh/include/cpu-sh4/cpu/dma-register.h | 2 +-
drivers/dma/shdma.c | 27 +++++++++++++++++++++------
drivers/video/sh_mobile_lcdcfb.c | 27 +++++++++++++--------------
6 files changed, 40 insertions(+), 25 deletions(-)
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)
More majordomo info at
Please read the FAQ at