Merge branch 'fec'
authorDavid S. Miller <davem@davemloft.net>
Mon, 22 Jul 2013 23:50:38 +0000 (16:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Jul 2013 23:50:38 +0000 (16:50 -0700)
commitc3f51d5f387b552b9d9fd7f41e19b84929712f82
tree8d5d903de54a8ab5d31605d5077fa3b5fc8934f7
parenteda297729171fe16bf34fe5b0419dfb69060f623
parent0d9b2ab1c3760a7ca28293c0ae48c2302d71ce96
Merge branch 'fec'

Fabio Estevam says:

====================
This series improves clock handling in the driver by not enabling/disabling
the optional ptp and enet_out clocks unconditionally, check for the return value
of clk_prepare_enable and also handle clk_ptp in suspend/resume.

Remove an unneeded check in platform_get_resource() and also use
devm_request_irq() that can help to simplify the code.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Frank Li <lznuaa@gmail.com>