summaryrefslogtreecommitdiffstats
path: root/sound/atmel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-20 20:10:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-20 20:10:52 -0700
commiteda0841094a3a232357ca10a24b40da461db3fcf (patch)
tree08f6ffd17275e6fab7bd8014d849d2fce46632d9 /sound/atmel
parent6e158d21986fa15d21fd32cf241d167d4d741ae3 (diff)
parent105f4622104848ff1ee1f644d661bef9dec3eb27 (diff)
downloadblackbird-op-linux-eda0841094a3a232357ca10a24b40da461db3fcf.tar.gz
blackbird-op-linux-eda0841094a3a232357ca10a24b40da461db3fcf.zip
Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.40' of git://linux-nfs.org/~bfields/linux: nfsd4: fix break_lease flags on nfsd open nfsd: link returns nfserr_delay when breaking lease nfsd: v4 support requires CRYPTO nfsd: fix dependency of nfsd on auth_rpcgss
Diffstat (limited to 'sound/atmel')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud