]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Thu, 6 Jan 2011 09:27:34 +0000 (18:27 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 6 Jan 2011 09:27:34 +0000 (18:27 +0900)
Conflicts:
drivers/video/sh_mobile_lcdcfb.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
1  2 
drivers/video/sh_mobile_hdmi.c
drivers/video/sh_mobile_lcdcfb.c

Simple merge
Simple merge