git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
media
/
atomisp
/
pci
/
atomisp2
/
css2400
/
runtime
/
isys
/
src
/
rx.c
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c
index 46a157f64343c21e176efc976fcea11140b0efbc..70f6cb5e5918d185fb9f23b1746e39c808c3bd39 100644
(file)
--- a/
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c
+++ b/
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c
@@
-13,7
+13,7
@@
* more details.
*/
#else
-/*
*
+/*
Support for Intel Camera Imaging ISP subsystem.
Copyright (c) 2010 - 2015, Intel Corporation.