aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/setlocalversion
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 15:13:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 15:13:05 -0700
commita0e3390787ef523699ae1f3f3ea0ca953e630be2 (patch)
tree0769becdd64b31489be18fdda583e0f38eca146f /scripts/setlocalversion
parentMerge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
parentnfs4: The difference of 2 pointers is ptrdiff_t (diff)
downloadlinux-dev-a0e3390787ef523699ae1f3f3ea0ca953e630be2.tar.xz
linux-dev-a0e3390787ef523699ae1f3f3ea0ca953e630be2.zip
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: nfs4: The difference of 2 pointers is ptrdiff_t nfs: testing the wrong variable nfs: handle lock context allocation failures in nfs_create_request Fixed Regression in NFS Direct I/O path
Diffstat (limited to 'scripts/setlocalversion')
0 files changed, 0 insertions, 0 deletions