More or less the same as we have, but has a better fix for the conflict with commit 947ca1856a7e60aa6d20536785e6a42dff25aa6e ('slab: fix the DEADLOCK issue on l3 alien lock') svn path=/dists/sid/linux/; revision=19442
While doing this, resolve two conflicts with 3.2.32: - 3/286 'slab, lockdep: Annotate all slab caches' conflicts with commit 947ca1856a7e60aa6d20536785e6a42dff25aa6e 'slab: fix the DEADLOCK issue on l3 alien lock' in mm/slab.c - 100/286 'drivers/net: fix livelock issues' conflicts with commit 7c4a6106d6451fc03c491e61df37c044505d843a 'rapidio/rionet: fix multicast packet transmit logic' in drivers/net/rionet.c svn path=/dists/sid/linux/; revision=19439