diff options
| author | Dante Russo <drusso@codeaurora.org> | 2013-06-05 09:11:09 -0700 |
|---|---|---|
| committer | Dante Russo <drusso@codeaurora.org> | 2013-06-11 14:58:24 -0700 |
| commit | 85f672fa7130c68030239940fcfb9308c4f49f33 (patch) | |
| tree | f27d85c1f69e1e6654cf5b7a761f8ad7f359b2cf /utils/msg_q.h | |
| parent | 838f00b1ef086231e9ef49744eaf7006619b27aa (diff) | |
| download | gps-85f672fa7130c68030239940fcfb9308c4f49f33.tar.gz | |
Merge branch jb_mr1 into jb_2.6
Merged from from label
AU_LINUX_ANDROID_JB_MR1.04.02.02.049.306
Change-Id: Ie2f7fd3d25f8f28f5d1b6e733974bb5f75999ee8
Diffstat (limited to 'utils/msg_q.h')
| -rw-r--r-- | utils/msg_q.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/msg_q.h b/utils/msg_q.h index 4171540..d3d5cc5 100644 --- a/utils/msg_q.h +++ b/utils/msg_q.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -9,7 +9,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Code Aurora Forum, Inc. nor the names of its + * * Neither the name of The Linux Foundation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * |