From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 May 2010 15:37:39 +0000 (-0700)
Subject: Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal... 
X-Git-Tag: firefly_0821_release~9833^2~2219
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079;p=firefly-linux-kernel-4.4.55.git

Merge branch 'sh/for-2.6.34' of git://git./linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: fix a number of Oopses and leaks in SH framebuffer driver
  SH: fix error paths in DMA driver
  sh: sh7751 pci controller io port fix
  sh: Fix maximum number of SCIF ports in R2D defconfigs
  SH: fix TS field shift calculation for DMA drivers
---

bbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079