summaryrefslogtreecommitdiff
path: root/scripts/pnmtologo.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-04 18:37:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-04 18:37:09 -0700
commit43f63c8711ce02226b7bbdafeba7b8031faf3fb4 (patch)
treeb279ac78cc010464a8c757f352303511a87b855d /scripts/pnmtologo.c
parent6c216ec636f75d834461be15f83ec41a6759bd2b (diff)
parente4b41fb9dafb9af4fecb602bf73d858ab651eeed (diff)
Merge git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French. * git://git.samba.org/sfrench/cifs-2.6: Fix UNC parsing on mount Remove unnecessary check for NULL in password parser CIFS: Fix VFS lock usage for oplocked files Revert "CIFS: Fix VFS lock usage for oplocked files" cifs: writing past end of struct in cifs_convert_address() cifs: silence compiler warnings showing up with gcc-4.7.0 CIFS: Fix VFS lock usage for oplocked files
Diffstat (limited to 'scripts/pnmtologo.c')
0 files changed, 0 insertions, 0 deletions