projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca9c20c 3c0eee3)
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 patch | diff1 | diff2 | blob | history
drivers/video/sh_mobile_lcdcfb.c patch | diff1 | diff2 | blob | history

diff --cc drivers/video/sh_mobile_hdmi.c
Simple merge
diff --cc drivers/video/sh_mobile_lcdcfb.c
Simple merge
John Crispins staging tree