Merge branch 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/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
This commit is contained in:
Linus Torvalds 2009-05-22 07:33:38 -07:00
commit 66a26a8fa7
2 changed files with 9 additions and 1 deletions