From: Thierry Reding <treding@nvidia.com>
Date: Thu, 24 Oct 2013 13:02:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'pwm/for-next'
X-Git-Tag: next-20131024~16
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=645766abf88a9bde05de54c23a2f30fbdbfba746

Merge remote-tracking branch 'pwm/for-next'

Conflicts:
	arch/arm/mach-omap2/board-zoom-peripherals.c
---

645766abf88a9bde05de54c23a2f30fbdbfba746