commit | b3773301c4290f054aa2aa5379e59a1bf4f78bdf | [log] [tgz] |
---|---|---|
author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 28 20:14:38 2010 +0100 |
committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 28 20:14:38 2010 +0100 |
tree | aac1619d32800393b587bf034c7dadb9e3c24f7b | |
parent | be6786ac738801d39cfd264ec88c352efd029578 [diff] | |
parent | 1a0b1eac5012326e52d1dcf78695ac08f41c37d7 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable Conflicts: drivers/video/sh_mobile_hdmi.c