From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jan 2012 22:00:12 +0000 (-0800)
Subject: Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.3~479
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf3f33551b6d0acf8d21a53c9aa9cf8a0d73afa3;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

cf3f33551b6d0acf8d21a53c9aa9cf8a0d73afa3