From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 May 2009 14:33:38 +0000 (-0700)
Subject: Merge branch 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal... 
X-Git-Tag: v2.6.30-rc7~10
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=66a26a8fa7694cdfa418d1527416c4ea079309f4

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

* 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  video: stop sh_mobile_lcdcfb only if started
  sh: ap325 camera without i2c driver fix
---

66a26a8fa7694cdfa418d1527416c4ea079309f4