tree 578a2c07181a1832eea2dd4195b6ff2fcebf4c83
parent 722154e4cacf015161efe60009ae9be23d492296
parent 8bed90557d2600d25e58de30df48b244980164ec
author Linus Torvalds <torvalds@linux-foundation.org> 1273160259 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1273160259 -0700

Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/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