]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 20:03:57 +0000 (12:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 20:03:57 +0000 (12:03 -0800)
commitff5c87f0f39eb34847de4da6e38ab9eeae7c7bef
treea0a1f5bdc25491414df20ff90785ca14e3929cc3
parenta02ee26853bd17f7195ae0c62e9b96c84326d7a0
parent543e245f39129c85f20aedbf0ce5ef3eba63979b
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanups from Ingo Molnar:
 "Misc cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpu, amd: Fix a shadowed variable situation
  um, x86: Fix vDSO build
  x86: Delete non-required instances of include <linux/init.h>
  x86, realmode: Pointer walk cleanups, pull out invariant use of __pa()
  x86/traps: Clean up error exception handler definitions
arch/x86/include/asm/processor.h
arch/x86/include/asm/timer.h
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/intel.c