Merge branch 'linus' into cpus4096

Conflicts:

	arch/x86/xen/smp.c
	kernel/sched_rt.c
	net/iucv/iucv.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/misc/atmel_pwm.c b/drivers/misc/atmel_pwm.c
index 0d5ce03cdff2..5b5a14dab3d3 100644
--- a/drivers/misc/atmel_pwm.c
+++ b/drivers/misc/atmel_pwm.c
@@ -332,7 +332,7 @@ static int __init pwm_probe(struct platform_device *pdev)
         p->base = ioremap(r->start, r->end - r->start + 1);
         if (!p->base)
                 goto fail;
-        p->clk = clk_get(&pdev->dev, "mck");
+        p->clk = clk_get(&pdev->dev, "pwm_clk");
         if (IS_ERR(p->clk)) {
                 status = PTR_ERR(p->clk);
                 p->clk = NULL;