diff options
| author | Mauro Carvalho Chehab <[email protected]> | 2009-11-04 12:11:43 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <[email protected]> | 2009-12-05 18:41:11 -0200 |
| commit | 648732fcefa73932ae8caa8bcfd262863904dd66 (patch) | |
| tree | 51da4f1481bbbf9eee6c14ca8fb5c78e3028448e /net/unix/af_unix.c | |
| parent | 26b9d6c0b0e91c84b4713da5abd16baef3963d33 (diff) | |
V4L/DVB (13271a): Fix a badly solved merge conflict
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions