From: Linus Torvalds 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: Ubuntu-5.10.0-12.13~32825 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=66a26a8fa7694cdfa418d1527416c4ea079309f4;p=mirror_ubuntu-hirsute-kernel.git 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 --- 66a26a8fa7694cdfa418d1527416c4ea079309f4