linux-next: manual merge of the pwm tree with the s5p tree

Hi Thierry,

Today's linux-next merge of the pwm tree got a conflict in
drivers/pwm/pwm-samsung.c between commit 8f748e20b806 ("ARM: SAMSUNG:
Remove unused variable 'running' on PWM") from the s5p tree (where it is
called arch/arm/plat-samsung/pwm.c) and commit 2663e766c56a ("ARM
Samsung: Move s3c pwm driver to pwm framework") from the pwm tree.

I fixed it up and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au