tree 55f553b6d1480bd18dda06e3ab876fbe88e721ba
parent 067ab19923673e3d8c982d877bedb9d65c976c22
parent b0d5fdef521b1eadb3fc2c1283000af7ef0297bc
author Linus Torvalds <torvalds@linux-foundation.org> 1226015157 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226015157 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  net/9p: fix printk format warnings
  unsigned fid->fid cannot be negative
  9p: rdma: remove duplicated #include
  p9: Fix leak of waitqueue in request allocation path
  9p: Remove unneeded free of fcall for Flush
  9p: Make all client spin locks IRQ safe
  9p: rdma: Set trans prior to requesting async connection ops