]> git.karo-electronics.de Git - karo-tx-linux.git/commit - net/sched/sch_tbf.c
Merge remote-tracking branch 'samsung/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:00 +0000 (15:02 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:00 +0000 (15:02 +0200)
commit221ef60a6d2c255e8f8cfea501c8ba64f3d4316a
tree6f7252bb1671f2f58ee6b211bfebad953acd24af
parenta1cac1b190d640f6ecf7c66518b87cae256027d1
parentd2287944920d5bc07a2b118bc33e13becbc422c5
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c
MAINTAINERS
arch/arm/Kconfig
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/mach-exynos/mach-exynos4-dt.c
arch/arm/mach-exynos/mach-exynos5-dt.c
arch/arm/plat-samsung/devs.c
drivers/dma/Kconfig