ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/include/common/ini_dset.h

Index: chromeos/drivers/ath6kl/include/common/ini_dset.h
diff --git a/chromeos/drivers/ath6kl/include/ini_dset.h b/chromeos/drivers/ath6kl/include/common/ini_dset.h
similarity index 77%
rename from chromeos/drivers/ath6kl/include/ini_dset.h
rename to chromeos/drivers/ath6kl/include/common/ini_dset.h
index fcd5a68fdac309f5b473866cb9d2bd737243bee7..8cf1af834bd0101486f78d0f5e9afbe2ae13a280 100644
--- a/chromeos/drivers/ath6kl/include/ini_dset.h
+++ b/chromeos/drivers/ath6kl/include/common/ini_dset.h
@@ -1,21 +1,23 @@
 //------------------------------------------------------------------------------
-// <copyright file="ini_dset.h" company="Atheros">
-//    Copyright (c) 2004-2007 Atheros Corporation.  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
-// published by the Free Software Foundation;
+// Copyright (c) 2004-2010 Atheros Corporation.  All rights reserved.
+//
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
 //
 //
-//------------------------------------------------------------------------------
-//==============================================================================
 // Author(s): ="Atheros"
-//==============================================================================
+//------------------------------------------------------------------------------
 
 #ifndef _INI_DSET_H_
 #define _INI_DSET_H_