| commit | 15a463532ed22db55339cda370ddd4cf664ad95d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 08 19:04:47 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 08 19:04:47 2012 -0800 |
| tree | 7d4307efe1d167910c4a359673c884c495e0aae9 | |
| parent | e862f2e4693f287669e84971c778bf071bd0526b [diff] | |
| parent | 025e4ab3db07fcbf62c01e4f30d1012234beb980 [diff] |
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()