diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-02-04 12:44:11 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-02-04 12:44:11 +0200 |
| commit | d6c2152b3efd73be265f426b5a1bb50ec436d999 (patch) | |
| tree | f35b2a9b40c82028a4a2ecd4593d592431db8fc2 /fs/nfsd | |
| parent | ee06bd155b081a1895f995ec2777094c7e746152 (diff) | |
| parent | 811fbb1f580ca024a0af603dfaef08a4d1dcb5ef (diff) | |
| download | linux-d6c2152b3efd73be265f426b5a1bb50ec436d999.tar.bz2 | |
Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next
Merge fbdev topic branches
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions