Hi Dave,

On Wed, 10 Dec 2014 14:49:43 -0500 (EST) David Miller <davem@davemloft.net> wrote:
>
> As you have seen there are a lot of merge hassles to sort out between
> the 'net' and 'net-next' tree right now, probably I just added a few
> more :-)
> 
> I'll try to do the merge by the end of today so that these headaches
> go away for you.

Much appreciated.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au