author | Russell King <rmk+kernel@arm.linux.org.uk> | |
Thu, 28 Oct 2010 19:14:38 +0000 (20:14 +0100) | ||
committer | Russell King <rmk+kernel@arm.linux.org.uk> | |
Thu, 28 Oct 2010 19:14:38 +0000 (20:14 +0100) | ||
commit | b3773301c4290f054aa2aa5379e59a1bf4f78bdf | |
tree | aac1619d32800393b587bf034c7dadb9e3c24f7b | tree | snapshot (tar.xz tar.gz zip) |
parent | be6786ac738801d39cfd264ec88c352efd029578 | commit | diff |
parent | 1a0b1eac5012326e52d1dcf78695ac08f41c37d7 | commit | diff |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
drivers/video/sh_mobile_hdmi.c
Conflicts:
drivers/video/sh_mobile_hdmi.c