Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 May 2010 14:56:45 +0000 (07:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 May 2010 14:56:45 +0000 (07:56 -0700)
commit508ff9d41c9aa7e178f6330e703a22af03090dd5
treed0098fad8ac34f2f3ee7f162a83ba1ae18edd77f
parent3ac4e829bd8575e9adea2ba1b9329da363881ffb
parentd77f873fdd21912803836da78f627d2efd267082
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  vhost: fix barrier pairing