tree aac1619d32800393b587bf034c7dadb9e3c24f7b
parent be6786ac738801d39cfd264ec88c352efd029578
parent 1a0b1eac5012326e52d1dcf78695ac08f41c37d7
author Russell King <rmk+kernel@arm.linux.org.uk> 1288293278 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1288293278 +0100

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
	drivers/video/sh_mobile_hdmi.c