diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-14 18:44:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-14 18:44:29 -0700 |
commit | 7223b915421716b4e57ffb7e13f41f1b926db55c (patch) | |
tree | 2c5fb902eb2986c84ee8f0f1988cc3d63b9d0107 /fs/ceph/osdmap.h | |
parent | d471a4b9f2ac327c15300ba2b2bda2c6d6fd03bc (diff) | |
parent | 091ebf07a2408f9a56634caa0f86d9360e9af23b (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
lguest: stop using KVM hypercall mechanism
lguest: workaround cmpxchg8b_emu by ignoring cli in the guest.
Diffstat (limited to 'fs/ceph/osdmap.h')
0 files changed, 0 insertions, 0 deletions