tree f5a571fb60ee2fe1320001aed744eaa5e8c832e0
parent e6a4b6f5eaa8478b7a0b9a17e40c51463631db1a
parent 0eb808eb753cd44e740da8e64f5c97a2a8e07578
author Linus Torvalds <torvalds@linux-foundation.org> 1394497596 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1394497596 -0700

Merge branch 'akpm' (patches from Andrew Morton)

Merge misc fixes from Andrew Morton:
 "Nine fixes"

* emailed patches from Andrew Morton akpm@linux-foundation.org>:
  cris: convert ffs from an object-like macro to a function-like macro
  hfsplus: add HFSX subfolder count support
  tools/testing/selftests/ipc/msgque.c: handle msgget failure return correctly
  MAINTAINERS: blackfin: add git repository
  revert "kallsyms: fix absolute addresses for kASLR"
  mm/Kconfig: fix URL for zsmalloc benchmark
  fs/proc/base.c: fix GPF in /proc/$PID/map_files
  mm/compaction: break out of loop on !PageBuddy in isolate_freepages_block
  mm: fix GFP_THISNODE callers and clarify