aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-11 15:44:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-11 15:44:38 -0700
commit6b98cd5aad3bb51a3b5b51ba670ab8d5fe1cc487 (patch)
treec38970f362c4de594a7433de5989cae0a199d199 /fs/nfsd
parentb42282e5a05018ecdc0d63a4ad530b0999785912 (diff)
parent8faa7cf828bca1745a4ed599876567f5afc47544 (diff)
downloadkernel_samsung_smdk4412-6b98cd5aad3bb51a3b5b51ba670ab8d5fe1cc487.zip
kernel_samsung_smdk4412-6b98cd5aad3bb51a3b5b51ba670ab8d5fe1cc487.tar.gz
kernel_samsung_smdk4412-6b98cd5aad3bb51a3b5b51ba670ab8d5fe1cc487.tar.bz2
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6: dt/fsldma: fix build warning caused by of_platform_device changes spi: Fix race condition in stop_queue() gpio/pch_gpio: Fix output value of pch_gpio_direction_output() gpio/ml_ioh_gpio: Fix output value of ioh_gpio_direction_output() gpio/pca953x: fix error handling path in probe() call
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions