diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 18:10:13 +0200 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 18:10:13 +0200 |
commit | da821eb7d42935b0f7056d98c75fd1150f6636f4 (patch) | |
tree | de83ac171d51bbe7621110c3145a68c198b13711 /drivers/tty/amiserial.c | |
parent | ARM: EXYNOS: fix compilation error introduced due to common clock migration (diff) | |
parent | Linux 3.9-rc5 (diff) | |
download | linux-da821eb7d42935b0f7056d98c75fd1150f6636f4.tar.xz linux-da821eb7d42935b0f7056d98c75fd1150f6636f4.zip |
Merge commit 'v3.9-rc5' into next/clk-exynos
Conflicts:
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos5440.dtsi
Diffstat (limited to 'drivers/tty/amiserial.c')
0 files changed, 0 insertions, 0 deletions