]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge remote-tracking branch 'tglx/x86/urgent' into x86/urgent
authorIngo Molnar <mingo@kernel.org>
Thu, 1 Oct 2015 07:02:11 +0000 (09:02 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 1 Oct 2015 07:02:11 +0000 (09:02 +0200)
Pick up the WCHAN fixes from Thomas.

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

Trivial merge