From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754669Ab0DZHsg (ORCPT ); Mon, 26 Apr 2010 03:48:36 -0400 Received: from 124x34x33x190.ap124.ftth.ucom.ne.jp ([124.34.33.190]:51680 "EHLO master.linux-sh.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753717Ab0DZHsf (ORCPT ); Mon, 26 Apr 2010 03:48:35 -0400 Date: Mon, 26 Apr 2010 16:48:15 +0900 From: Paul Mundt To: Linus Torvalds Cc: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] sh updates for 2.6.34-rc6 Message-ID: <20100426074815.GA17288@linux-sh.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-)