linux-next: manual merge of the arm-soc tree with the net-next tree

Hi Joachim,

On Tue, 13 Nov 2012 08:21:26 +0100 Joachim  Eastwood [off-list ref] wrote:

The platform_data/atmel.h include shouldn't be necessary since the
driver already includes platform_data/macb.h.

Otherwise the fix up looks correct.

Thanks, I have fixed up my fix for tomorrow.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121113/07aaa4ef/attachment.sig>