diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 21:14:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 21:14:16 -0400 |
| commit | 14ffe009ca60856555df3aec942239d8beed74d3 (patch) | |
| tree | b5639c028c996a6907ac0cf6e9f0175398a3a62b /tools | |
| parent | ce40be7a820bb393ac4ac69865f018d2f4038cf0 (diff) | |
| parent | ec073619cdda99ffb6a07d3b8000569f5210815a (diff) | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/include/linux/rbtree.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/util/include/linux/rbtree.h b/tools/perf/util/include/linux/rbtree.h index 9bcdc844b330..2a030c5af3aa 100644 --- a/tools/perf/util/include/linux/rbtree.h +++ b/tools/perf/util/include/linux/rbtree.h | |||
| @@ -1,3 +1,2 @@ | |||
| 1 | #include <stdbool.h> | 1 | #include <stdbool.h> |
| 2 | #include <stdbool.h> | ||
| 3 | #include "../../../../include/linux/rbtree.h" | 2 | #include "../../../../include/linux/rbtree.h" |