Merge branch 'akpm' (Andrew's tree)

Browse source

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

...

This commit is contained in:

Linus Torvalds 2012-02-08 19:04:47 -08:00

parent e862f2e469 025e4ab3db

commit 15a463532e

6 changed files with 18 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/leds/leds-lm3530.c

View file

4

drivers/pcmcia/ds.c

View file

2

fs/nilfs2/ioctl.c

View file

11

mm/compaction.c

View file

4

mm/huge_memory.c

View file

2

mm/swap.c

View file