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)
commit1928e87bcf185f56008d0746f887b691c1cb8c4a
treebc8db9e9cb40b73742d05e2e68189bd647687249
parentca9c20ce2b383032b71bdae9ec0b468d428ca8d4
parent3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:
drivers/video/sh_mobile_lcdcfb.c

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