diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-01 04:57:57 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-01 04:57:57 +0300 |
| commit | 22a5b566c8c442b0b35b3b106795e2f2b3578096 (patch) | |
| tree | 09c7811b5aabdf9ae2b429bf144b7ab2204c50c3 /fs/nfs/dir.c | |
| parent | 114279be2120a916e8a04feeb2ac976a10016f2f (diff) | |
| parent | 3b24f0950bc55ca604a9f0da3ca894f9315cb573 (diff) | |
| download | linux-22a5b566c8c442b0b35b3b106795e2f2b3578096.tar.xz | |
Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91
* 'for_linus' of git://github.com/at91linux/linux-2.6-at91:
at91/board-yl-9200: fix typo in video support
atmel_spi: fix warning In function 'atmel_spi_dma_map_xfer'
at91/picotux200: remove commenting usb device and dataflash support
at91: rename rm9200ek and rm9200dk board file name
at91rm9200ek: fix warning: 'ek_mmc_data' defined but not used
at91rm9200dk: fix warning: 'dk_mmc_data' defined but not used
at91: Convert remaining boards to new-style UART initialization
at91: merge all at91rm9200 defconfig in one single file
Diffstat (limited to 'fs/nfs/dir.c')
0 files changed, 0 insertions, 0 deletions