From: Paul Mundt on
Please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh/for-2.6.34

Which contains:

Guennadi Liakhovetski (2):
SH: fix TS field shift calculation for DMA drivers
SH: fix error paths in DMA 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 +++++++++++++++++++++------
5 files changed, 27 insertions(+), 11 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/