Commit Graph

2 Commits

Author SHA1 Message Date
Ben Hutchings c27a3214a9 [rt] Update to 3.2.32-rt48
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
2012-10-21 03:15:40 +00:00
Ben Hutchings 24b6ca0b3a [rt] Update to 3.2.31-rt47
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
2012-10-20 06:00:02 +00:00