]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb60d22040a03eb120e437d6c608dbcbe5ef544af
treebc8db9e9cb40b73742d05e2e68189bd647687249
parentbdf217aafe7c6d7f49f5e87ef45e5e6e6aa7c7f0
parentb1d6256ab80481c7e660520326c38f375686235c
Merge branch 'master' of master.kernel.org:/pub/scm/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