ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/reorder/rcv_aggr.c

Index: chromeos/drivers/ath6kl/reorder/rcv_aggr.c
diff --git a/chromeos/drivers/ath6kl/reorder/rcv_aggr.c b/chromeos/drivers/ath6kl/reorder/rcv_aggr.c
index 3bfba4fbc0515b8e3aec34f28703cd4d257faac5..092bb3007c5d2c610018555bb3ae75fc77bd4798 100644
--- a/chromeos/drivers/ath6kl/reorder/rcv_aggr.c
+++ b/chromeos/drivers/ath6kl/reorder/rcv_aggr.c
@@ -4,14 +4,18 @@
  * 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;
 //
-// 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.
+// 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.
 //
 //
  *