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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
acpica
/
utobject.c
diff --git
a/drivers/acpi/acpica/utobject.c
b/drivers/acpi/acpica/utobject.c
index cb3db9fed50d1d753fcb1137518bdc096ae58356..375901c0a596ee7999b59a6b0771ec3a9ba859e8 100644
(file)
--- a/
drivers/acpi/acpica/utobject.c
+++ b/
drivers/acpi/acpica/utobject.c
@@
-5,7
+5,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 201
7
, Intel Corp.
+ * Copyright (C) 2000 - 201
8
, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without