tree f04e4c0935dd9e3f05741bf812229b36b18683cd
parent 71b1b20b8aea6ba4a1a15736409f1261d8dfe1da
parent 0bf380bc70ecba68cb4d74dc656cc2fa8c4d801a
author Linus Torvalds <torvalds@linux-foundation.org> 1328381514 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1328381514 -0800

Merge branch 'akpm'

* akpm:
  mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block during isolation for migration
  readahead: fix pipeline break caused by block plug
  kprobes: fix a memory leak in function pre_handler_kretprobe()
  drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer
  lkdtm: avoid calling lkdtm_do_action() with spinlock held
  mm/filemap_xip.c: fix race condition in xip_file_fault()
  mm/memcontrol.c: fix warning with CONFIG_NUMA=n
  avr32: select generic atomic64_t support
  mm: postpone migrated page mapping reset
  xtensa: fix memscan()
  MAINTAINERS: update lguest F: patterns
  MAINTAINERS: remove staging sections
  MAINTAINERS: remove iMX5 section
  MAINTAINERS: update partitions block F: patterns