]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'akpm' (Andrew's tree)
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Feb 2012 03:04:47 +0000 (19:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Feb 2012 03:04:47 +0000 (19:04 -0800)
Five fixes

* branch 'akpm':
  pcmcia: fix socket refcount decrementing on each resume
  mm: fix UP THP spin_is_locked BUGs
  drivers/leds/leds-lm3530.c: fix setting pltfm->als_vmax
  mm: compaction: check for overlapping nodes during isolation for migration
  nilfs2: avoid overflowing segment numbers in nilfs_ioctl_clean_segments()


Trivial merge