diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-16 21:39:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-16 21:39:21 +0200 |
| commit | 3369d116934b70bd2755cdd8b2af9741d18a4047 (patch) | |
| tree | 12c5444ae63bb9d6b00829b26668009d4c87a1c8 /drivers/clocksource/time-armada-370-xp.c | |
| parent | Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi (diff) | |
| parent | cifs: update cifs.txt and remove some outdated infos (diff) | |
| download | linux-3369d116934b70bd2755cdd8b2af9741d18a4047.tar.xz linux-3369d116934b70bd2755cdd8b2af9741d18a4047.zip | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French:
"Two minor cifs fixes and a minor documentation cleanup for cifs.txt"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
cifs: update cifs.txt and remove some outdated infos
cifs: Avoid calling unlock_page() twice in cifs_readpage() when using fscache
cifs: Do not take a reference to the page in cifs_readpage_worker()
Diffstat (limited to 'drivers/clocksource/time-armada-370-xp.c')
0 files changed, 0 insertions, 0 deletions