From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Oct 2012 01:14:16 +0000 (+0900)
Subject: Merge branch 'akpm' (Fixups from Andrew)
X-Git-Tag: v3.7-rc1~53
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=14ffe009ca60856555df3aec942239d8beed74d3;p=~emulex%2Finfiniband.git

Merge branch 'akpm' (Fixups from Andrew)

Merge misc fixes from Andrew Morton:
 "Followups, fixes and some random stuff I found on the internet."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (11 patches)
  perf: fix duplicate header inclusion
  memcg, kmem: fix build error when CONFIG_INET is disabled
  rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS
  rapidio: fix comment
  lib/kasprintf.c: use kmalloc_track_caller() to get accurate traces for kvasprintf
  rapidio: update for destination ID allocation
  rapidio: update asynchronous discovery initialization
  rapidio: use msleep in discovery wait
  mm: compaction: fix bit ranges in {get,clear,set}_pageblock_skip()
  arch/powerpc/platforms/pseries/hotplug-memory.c: section removal cleanups
  arch/powerpc/platforms/pseries/hotplug-memory.c: fix section handling code
---

14ffe009ca60856555df3aec942239d8beed74d3