linux-next: manual merge of the akpm tree with the net-next tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/bridge/br_stp.c between commit 42275bd8fcb3 ("switchdev: don't use
anonymous union on switchdev attr/obj structs") from the net-next tree
and commit "net/bridge/br_stp.c: work around gcc-4.4.4 initializer bug"
from the akpm tree.

I fixed it up (the former solves the same problem as the latter but in
a different way, so I just dropped the latter) and can carry the fix as
necessary (no action is required).

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

pgpShIwiX1aMt.pgp
Description: OpenPGP digital signature