linux/arch/x86/include/uapi/asm
Linus Torvalds 6842d98de7 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull powertool update from Len Brown:
 "This updates the tree w/ the latest version of turbostat, which
  reports temperature and - on SNB and later - Watts."

Fix up semantic merge conflict as per Len.

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools: Allow tools to be installed in a user specified location
  tools/power: turbostat: make Makefile a bit more capable
  tools/power x86_energy_perf_policy: close /proc/stat in for_every_cpu()
  tools/power turbostat: v3.0: monitor Watts and Temperature
  tools/power turbostat: fix output buffering issue
  tools/power turbostat: prevent infinite loop on migration error path
  x86 power: define RAPL MSRs
  tools/power/x86/turbostat: share kernel MSR #defines
2012-12-18 12:34:29 -08:00
..
a.out.h
auxvec.h
bitsperlong.h
boot.h
bootparam.h
byteorder.h
debugreg.h
e820.h
errno.h
fcntl.h
hw_breakpoint.h create non-empty arch/x86/include/uapi/asm/ files 2012-12-17 17:15:11 -08:00
hyperv.h
ioctl.h
ioctls.h
ipcbuf.h
ist.h
Kbuild
kvm_para.h
kvm.h
ldt.h
mce.h
mman.h
msgbuf.h
msr-index.h Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2012-12-18 12:34:29 -08:00
msr.h
mtrr.h
param.h
perf_regs.h
poll.h
posix_types_32.h
posix_types_64.h
posix_types_x32.h
posix_types.h
prctl.h
processor-flags.h
ptrace-abi.h
ptrace.h
resource.h
sembuf.h
setup.h create non-empty arch/x86/include/uapi/asm/ files 2012-12-17 17:15:11 -08:00
shmbuf.h
sigcontext32.h
sigcontext.h
siginfo.h
signal.h
socket.h
sockios.h
stat.h
statfs.h
svm.h
swab.h
termbits.h
termios.h
types.h
ucontext.h
unistd.h
vm86.h
vmx.h
vsyscall.h