aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 20:14:38 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-28 20:14:38 +0100
commitb3773301c4290f054aa2aa5379e59a1bf4f78bdf (patch)
treeaac1619d32800393b587bf034c7dadb9e3c24f7b /arch/arm/mach-mx3
parentbe6786ac738801d39cfd264ec88c352efd029578 (diff)
parent1a0b1eac5012326e52d1dcf78695ac08f41c37d7 (diff)
downloadkernel_samsung_smdk4412-b3773301c4290f054aa2aa5379e59a1bf4f78bdf.zip
kernel_samsung_smdk4412-b3773301c4290f054aa2aa5379e59a1bf4f78bdf.tar.gz
kernel_samsung_smdk4412-b3773301c4290f054aa2aa5379e59a1bf4f78bdf.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts: drivers/video/sh_mobile_hdmi.c
Diffstat (limited to 'arch/arm/mach-mx3')
0 files changed, 0 insertions, 0 deletions