diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-05-12 15:35:14 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-05-12 15:35:14 -0700 |
commit | 106f1ce29f1fa7ad18e47823789c176df57d75ee (patch) | |
tree | 44f6a51ff81fefba6834383dc2bcb45aa4ebe60e /drivers/gator/gator_trace_gpu.c | |
parent | 1f8fdf83fe376cc83e96e942689a6cfac01e9634 (diff) | |
parent | 0ed41f1a9564c0733ad155b742ac66fb41d2f9d3 (diff) |
Merge branch 'v3.10/topic/gator' into linux-linaro-lsk-v3.10
* v3.10/topic/gator:
gator: Enable multiple source copies to exist in Android build environments
gator: Add config for building the module in-tree
gator: Version 5.21.1
Diffstat (limited to 'drivers/gator/gator_trace_gpu.c')
-rw-r--r-- | drivers/gator/gator_trace_gpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gator/gator_trace_gpu.c b/drivers/gator/gator_trace_gpu.c index 5de9152e365a..d9b82ee1857f 100644 --- a/drivers/gator/gator_trace_gpu.c +++ b/drivers/gator/gator_trace_gpu.c @@ -1,5 +1,5 @@ /** - * Copyright (C) ARM Limited 2010-2014. All rights reserved. + * Copyright (C) ARM Limited 2010-2015. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as |