Ingo Molnar f320ead76a Merge branch 'x86/asm' into locking/core ...

Upcoming changes to static keys is interacting/conflicting with the following
pending TSC commits in tip:x86/asm:

  4ea1636b04 x86/asm/tsc: Rename native_read_tsc() to rdtsc()
  ...

So merge it into the locking tree to have a smoother resolution.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2015-08-03 11:04:00 +02:00

..

fault-injection

fault-injection: fix failcmd.sh warning

2012-07-31 18:42:38 -07:00

ktest

ktest: Place quotes around item variable

2015-02-03 15:45:13 -05:00

nvdimm

tools/testing/nvdimm: add mock acpi_nfit_flush_address entries to nfit_test

2015-07-10 14:07:03 -04:00

selftests

Merge branch 'x86/asm' into locking/core

2015-08-03 11:04:00 +02:00