summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-09 09:58:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-09 09:58:31 -0800
commit799dd75b1a8380a967c929a4551895788c374b31 (patch)
tree7132aafc4ade16fda136d63f1be6ea867edde79b /fs/nfs
parent6bee58259fce0baad7b02c7a48146d50fa7f6c3c (diff)
parentafa08974fe80c198b8650f73ed8ab59135ca10d0 (diff)
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: Add an interface to lock/unlock an I2C bus segment i2c-piix4: Modify code name SB900 to Hudson-2
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions