Merge branch 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2009 14:33:38 +0000 (07:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2009 14:33:38 +0000 (07:33 -0700)
commit66a26a8fa7694cdfa418d1527416c4ea079309f4
treebedf1c89bf03d074bc7d636e9783d82df093506e
parent9a2845c453d170e4e9b1437fa671dbf39b0e7bd8
parent8e9bb19ef97d6594e735bee64b6d72103e350854
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