From: Linus Torvalds Date: Thu, 3 Sep 2015 23:36:33 +0000 (-0700) Subject: Merge branch 'pcmcia' of git://ftp.arm.linux.org.uk/~rmk/linux-arm X-Git-Tag: v4.3-rc1~87 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4c92b5bb14226faa16d29a1df5752baf1ff22b53;p=users%2Fjedix%2Flinux-maple.git Merge branch 'pcmcia' of git://ftp.arm.linux.org.uk/~rmk/linux-arm Pull ARM pcmcia updates from Russell King: "A series of changes updating the PXA and SA11x0 PCMCIA code to use devm_* APIs, and resolve some resource leaks in doing so. This results in a few small cleanups which are included in this set. FYI, the recommit of these today is to add Robert Jarzmik's reviewed-by tags, which I'd forgotten to add from mid-July" * 'pcmcia' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: pcmcia: soc_common: remove skt_dev_info's clk pointer pcmcia: sa11xx_base.c: remove useless init/exit functions pcmcia: sa1111: simplify clk handing in sa1111_pcmcia_add() pcmcia: sa1111: update socket driver to use devm_clk_get() API pcmcia: pxa2xx: convert memory allocation to devm_* API pcmcia: pxa2xx: update socket driver to use devm_clk_get() API pcmcia: sa11x0: convert memory allocation to devm_* API pcmcia: sa11x0: fix missing clk_put() in sa11x0 socket drivers --- 4c92b5bb14226faa16d29a1df5752baf1ff22b53