From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Feb 2012 03:04:47 +0000 (-0800)
Subject: Merge branch 'akpm' (Andrew's tree)
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=15a463532ed22db55339cda370ddd4cf664ad95d;p=linux-beck.git

Merge branch 'akpm' (Andrew's tree)

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()
---

15a463532ed22db55339cda370ddd4cf664ad95d