Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2012 22:00:12 +0000 (14:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2012 22:00:12 +0000 (14:00 -0800)
commitcf3f33551b6d0acf8d21a53c9aa9cf8a0d73afa3
treeb657e1b85befbcdff5b2ee39e5ff026d6342e694
parent69734b644bf19f20d2989e1a8e5bf59c837ee5c1
parent1affc46cffad9f2bc7c9ffec85726446903a58f9
Merge branch 'x86-cleanups-for-linus' of git://git./linux/kernel/git/tip/tip

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Use "do { } while(0)" for empty lock_cmos()/unlock_cmos() macros
  x86: Use "do { } while(0)" for empty flush_tlb_fix_spurious_fault() macro
  x86, CPU: Drop superfluous get_cpu_cap() prototype
  arch/x86/mm/pageattr.c: Quiet sparse noise; local functions should be static
  arch/x86/kernel/ptrace.c: Quiet sparse noise
  x86: Use kmemdup() in copy_thread(), rather than duplicating its implementation
  x86: Replace the EVT_TO_HPET_DEV() macro with an inline function
arch/x86/kernel/hpet.c
arch/x86/kernel/process_64.c