tree c0593947a2c4b0e9e1bf1327548eb32feb45cacb
parent 121027a7a64a12e9e5c0289f12473ff11678a812
parent 19348e749e9515c429f5d561d2f2c724862a4bee
author Linus Torvalds <torvalds@linux-foundation.org> 1361330029 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1361330029 -0800

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanup patches from Ingo Molnar:
 "Misc smaller cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: ptrace.c only needs export.h and not the full module.h
  x86, apb_timer: remove unused variable percpu_timer
  um: don't compare a pointer to 0
  arch/x86/platform/uv: use ARRAY_SIZE where possible