]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
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)
* '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


Trivial merge