summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-06-30 15:27:52 -0700
committerOlof Johansson <olof@lixom.net>2012-06-30 15:27:52 -0700
commit5d5474df64d49564f297d9259932452ea64b745d (patch)
tree6aafc16d8a264082a72bb5d150a6ad8ffb097aa0 /arch/x86
parent5ae95aefb73b32ec4e7c46554304042ba82230ca (diff)
parent58c553d4d4637e1955a571350888530cd0073276 (diff)
downloadlinux-5d5474df64d49564f297d9259932452ea64b745d.tar.bz2
Merge branch 'v3.5-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.5-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Fix EXYNOS_DEV_DMA Kconfig entry ARM: SAMSUNG: Fix for S3C2412 EBI memory mapping ARM: SAMSUNG: Should check for IS_ERR(clk) instead of NULL
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions