64 files changed, 3375 insertions, 10 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index e64377cac..c0b93d549 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,25 +1,36 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
 KERNEL_VERSION:=	2.6.39.4
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		a17c748c2070168f1e784e9605ca043d
 endif
 ifeq ($(ADK_KERNEL_VERSION_2_6_39_4),y)
 KERNEL_VERSION:=	2.6.39.4
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		a17c748c2070168f1e784e9605ca043d
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_0_22),y)
-KERNEL_VERSION:=	3.0.22
+ifeq ($(ADK_KERNEL_VERSION_3_0_25),y)
+KERNEL_VERSION:=	3.0.25
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		0cb510da24d9cf7bd17091ed49176178
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_1_10),y)
 KERNEL_VERSION:=	3.1.10
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		3649bdaa50ffd9114cc16486ec54d83a
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_2_10),y)
-KERNEL_VERSION:=	3.2.10
+ifeq ($(ADK_KERNEL_VERSION_3_2_12),y)
+KERNEL_VERSION:=	3.2.12
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		9c9ab852e069fef357e2a29a98cf03e7
 endif
+ifeq ($(ADK_KERNEL_VERSION_3_3),y)
+KERNEL_VERSION:=	3.3
+KERNEL_MOD_VERSION:=	3.3.0
+KERNEL_RELEASE:=	1
+KERNEL_MD5SUM:=		98a6cdd7d082b7ea72df9c89842bac74
+endif
diff --git a/mk/kernel.mk b/mk/kernel.mk
index d5288cd7e..01c0813ba 100644
--- a/mk/kernel.mk
+++ b/mk/kernel.mk
@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 LINUX_KMOD_SUFFIX=ko
-MODULES_SUBDIR := lib/modules/$(KERNEL_VERSION)
+MODULES_SUBDIR := lib/modules/$(KERNEL_MOD_VERSION)
 LINUX_BUILD_DIR := $(BUILD_DIR)/linux-$(ADK_TARGET_ARCH)
 KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
 MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR)
@@ -55,8 +55,8 @@ $$(PKG_$(1)):
 	    $(KERNEL_VERSION)-$(KERNEL_RELEASE) $(CPU_ARCH)
 	echo "Depends: $$(IDEPENDK_$(1))" >> $$(I_$(1))/CONTROL/control
 ifneq ($(strip $(3)),)
-	mkdir -p $$(I_$(1))/lib/modules/$(KERNEL_VERSION)
-	$(CP) $(foreach mod,$(3),$(mod).$(LINUX_KMOD_SUFFIX)) $$(I_$(1))/lib/modules/$(KERNEL_VERSION)
+	mkdir -p $$(I_$(1))/lib/modules/$(KERNEL_MOD_VERSION)
+	$(CP) $(foreach mod,$(3),$(mod).$(LINUX_KMOD_SUFFIX)) $$(I_$(1))/lib/modules/$(KERNEL_MOD_VERSION)
 ifneq ($(4),)
 	mkdir -p $$(I_$(1))/etc/modules.d
 	for module in $(notdir $(3)); do \
diff --git a/mk/linux.mk b/mk/linux.mk
index 8cc68467f..669d595f8 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -5,7 +5,5 @@ PKG_NAME:=	linux
 PKG_VERSION:=	$(KERNEL_VERSION)
 PKG_RELEASE:=	$(KERNEL_RELEASE)
 PKG_MD5SUM:=	$(KERNEL_MD5SUM)
-PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(subst -, ,$(PKG_VERSION))))
-PKG_VERSION_MINOR:=$(word 2,$(subst ., ,$(subst -, ,$(PKG_VERSION))))
-PKG_SITES:=  	${MASTER_SITE_KERNEL:=kernel/v$(PKG_VERSION_MAJOR).$(PKG_VERSION_MINOR)/}
+PKG_SITES:=  	${MASTER_SITE_KERNEL:=kernel/v3.0/}
 DISTFILES=	$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/target/linux/patches/3.0.22/brcm.patch b/target/linux/patches/3.0.25/brcm.patch
index 87f30da1d..87f30da1d 100644
--- a/target/linux/patches/3.0.22/brcm.patch
+++ b/target/linux/patches/3.0.25/brcm.patch
diff --git a/target/linux/patches/3.0.22/bsd-compatibility.patch b/target/linux/patches/3.0.25/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.0.22/bsd-compatibility.patch
+++ b/target/linux/patches/3.0.25/bsd-compatibility.patch
diff --git a/target/linux/patches/3.0.22/cris-etrax.patch b/target/linux/patches/3.0.25/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.0.22/cris-etrax.patch
+++ b/target/linux/patches/3.0.25/cris-etrax.patch
diff --git a/target/linux/patches/3.0.22/defaults.patch b/target/linux/patches/3.0.25/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.0.22/defaults.patch
+++ b/target/linux/patches/3.0.25/defaults.patch
diff --git a/target/linux/patches/3.0.22/fon2100.patch b/target/linux/patches/3.0.25/fon2100.patch
index 038ff7020..038ff7020 100644
--- a/target/linux/patches/3.0.22/fon2100.patch
+++ b/target/linux/patches/3.0.25/fon2100.patch
diff --git a/target/linux/patches/3.0.22/gemalto.patch b/target/linux/patches/3.0.25/gemalto.patch
index f3c223b5e..f3c223b5e 100644
--- a/target/linux/patches/3.0.22/gemalto.patch
+++ b/target/linux/patches/3.0.25/gemalto.patch
diff --git a/target/linux/patches/3.0.22/mips-malta.patch b/target/linux/patches/3.0.25/mips-malta.patch
index cc8789dca..cc8789dca 100644
--- a/target/linux/patches/3.0.22/mips-malta.patch
+++ b/target/linux/patches/3.0.25/mips-malta.patch
diff --git a/target/linux/patches/3.0.22/mmc-host.patch b/target/linux/patches/3.0.25/mmc-host.patch
index 3d0e37add..3d0e37add 100644
--- a/target/linux/patches/3.0.22/mmc-host.patch
+++ b/target/linux/patches/3.0.25/mmc-host.patch
diff --git a/target/linux/patches/3.0.22/mtd-rootfs.patch b/target/linux/patches/3.0.25/mtd-rootfs.patch
index 5dad745d8..5dad745d8 100644
--- a/target/linux/patches/3.0.22/mtd-rootfs.patch
+++ b/target/linux/patches/3.0.25/mtd-rootfs.patch
diff --git a/target/linux/patches/3.0.22/non-static.patch b/target/linux/patches/3.0.25/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.0.22/non-static.patch
+++ b/target/linux/patches/3.0.25/non-static.patch
diff --git a/target/linux/patches/3.0.22/sparc-include.patch b/target/linux/patches/3.0.25/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.0.22/sparc-include.patch
+++ b/target/linux/patches/3.0.25/sparc-include.patch
diff --git a/target/linux/patches/3.0.22/startup.patch b/target/linux/patches/3.0.25/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.0.22/startup.patch
+++ b/target/linux/patches/3.0.25/startup.patch
diff --git a/target/linux/patches/3.0.22/usb-defaults-off.patch b/target/linux/patches/3.0.25/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.0.22/usb-defaults-off.patch
+++ b/target/linux/patches/3.0.25/usb-defaults-off.patch
diff --git a/target/linux/patches/3.0.22/uuid.patch b/target/linux/patches/3.0.25/uuid.patch
index 2529fdab5..2529fdab5 100644
--- a/target/linux/patches/3.0.22/uuid.patch
+++ b/target/linux/patches/3.0.25/uuid.patch
diff --git a/target/linux/patches/3.0.22/vga-cons-default-off.patch b/target/linux/patches/3.0.25/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.0.22/vga-cons-default-off.patch
+++ b/target/linux/patches/3.0.25/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.0.22/wlan-cf.patch b/target/linux/patches/3.0.25/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.0.22/wlan-cf.patch
+++ b/target/linux/patches/3.0.25/wlan-cf.patch
diff --git a/target/linux/patches/3.0.22/x86-build.patch b/target/linux/patches/3.0.25/x86-build.patch
index 339140f41..339140f41 100644
--- a/target/linux/patches/3.0.22/x86-build.patch
+++ b/target/linux/patches/3.0.25/x86-build.patch
diff --git a/target/linux/patches/3.0.22/zlib-inflate.patch b/target/linux/patches/3.0.25/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.0.22/zlib-inflate.patch
+++ b/target/linux/patches/3.0.25/zlib-inflate.patch
diff --git a/target/linux/patches/3.2.10/bsd-compatibility.patch b/target/linux/patches/3.2.12/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.2.10/bsd-compatibility.patch
+++ b/target/linux/patches/3.2.12/bsd-compatibility.patch
diff --git a/target/linux/patches/3.2.10/cris-etrax.patch b/target/linux/patches/3.2.12/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.2.10/cris-etrax.patch
+++ b/target/linux/patches/3.2.12/cris-etrax.patch
diff --git a/target/linux/patches/3.2.10/defaults.patch b/target/linux/patches/3.2.12/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.2.10/defaults.patch
+++ b/target/linux/patches/3.2.12/defaults.patch
diff --git a/target/linux/patches/3.2.10/gemalto.patch b/target/linux/patches/3.2.12/gemalto.patch
index f3c223b5e..f3c223b5e 100644
--- a/target/linux/patches/3.2.10/gemalto.patch
+++ b/target/linux/patches/3.2.12/gemalto.patch
diff --git a/target/linux/patches/3.2.10/mmc-host.patch b/target/linux/patches/3.2.12/mmc-host.patch
index 3d0e37add..3d0e37add 100644
--- a/target/linux/patches/3.2.10/mmc-host.patch
+++ b/target/linux/patches/3.2.12/mmc-host.patch
diff --git a/target/linux/patches/3.2.10/non-static.patch b/target/linux/patches/3.2.12/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.2.10/non-static.patch
+++ b/target/linux/patches/3.2.12/non-static.patch
diff --git a/target/linux/patches/3.2.10/sparc-include.patch b/target/linux/patches/3.2.12/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.2.10/sparc-include.patch
+++ b/target/linux/patches/3.2.12/sparc-include.patch
diff --git a/target/linux/patches/3.2.10/startup.patch b/target/linux/patches/3.2.12/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.2.10/startup.patch
+++ b/target/linux/patches/3.2.12/startup.patch
diff --git a/target/linux/patches/3.2.10/usb-defaults-off.patch b/target/linux/patches/3.2.12/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.2.10/usb-defaults-off.patch
+++ b/target/linux/patches/3.2.12/usb-defaults-off.patch
diff --git a/target/linux/patches/3.2.10/uuid.patch b/target/linux/patches/3.2.12/uuid.patch
index 2529fdab5..2529fdab5 100644
--- a/target/linux/patches/3.2.10/uuid.patch
+++ b/target/linux/patches/3.2.12/uuid.patch
diff --git a/target/linux/patches/3.2.10/vga-cons-default-off.patch b/target/linux/patches/3.2.12/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.2.10/vga-cons-default-off.patch
+++ b/target/linux/patches/3.2.12/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.2.10/wlan-cf.patch b/target/linux/patches/3.2.12/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.2.10/wlan-cf.patch
+++ b/target/linux/patches/3.2.12/wlan-cf.patch
diff --git a/target/linux/patches/3.2.10/x86-build.patch b/target/linux/patches/3.2.12/x86-build.patch
index 339140f41..339140f41 100644
--- a/target/linux/patches/3.2.10/x86-build.patch
+++ b/target/linux/patches/3.2.12/x86-build.patch
diff --git a/target/linux/patches/3.2.10/zlib-inflate.patch b/target/linux/patches/3.2.12/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.2.10/zlib-inflate.patch
+++ b/target/linux/patches/3.2.12/zlib-inflate.patch
diff --git a/target/linux/patches/3.3/bsd-compatibility.patch b/target/linux/patches/3.3/bsd-compatibility.patch
new file mode 100644
index 000000000..9e91a62de
--- /dev/null
+++ b/target/linux/patches/3.3/bsd-compatibility.patch
@@ -0,0 +1,2512 @@
+diff -Nur linux-2.6.36.orig/scripts/Makefile.lib linux-2.6.36/scripts/Makefile.lib
+--- linux-2.6.36.orig/scripts/Makefile.lib	2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/scripts/Makefile.lib	2010-11-28 18:34:22.000000000 +0100
+@@ -216,7 +216,12 @@
+ size_append = printf $(shell						\
+ dec_size=0;								\
+ for F in $1; do								\
+-	fsize=$$(stat -c "%s" $$F);					\
++	if stat -qs .>/dev/null 2>&1; then				\
++		statcmd='stat -f %z';					\
++	else								\
++		statcmd='stat -c %s';					\
++	fi;								\
++	fsize=$$($$statcmd $$F);					\
+ 	dec_size=$$(expr $$dec_size + $$fsize);				\
+ done;									\
+ printf "%08x\n" $$dec_size |						\
+diff -Nur linux-2.6.36.orig/scripts/mod/mk_elfconfig.c linux-2.6.36/scripts/mod/mk_elfconfig.c
+--- linux-2.6.36.orig/scripts/mod/mk_elfconfig.c	2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/scripts/mod/mk_elfconfig.c	2010-11-28 18:33:24.000000000 +0100
+@@ -1,7 +1,18 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <elf.h>
++
++#define EI_NIDENT (16)
++#define ELFMAG          "\177ELF"
++
++#define SELFMAG         4
++#define EI_CLASS        4
++#define ELFCLASS32      1               /* 32-bit objects */
++#define ELFCLASS64      2               /* 64-bit objects */
++
++#define EI_DATA         5               /* Data encoding byte index */
++#define ELFDATA2LSB     1               /* 2's complement, little endian */
++#define ELFDATA2MSB     2               /* 2's complement, big endian */
+ 
+ int
+ main(int argc, char **argv)
+diff -Nur linux-2.6.36.orig/scripts/mod/modpost.h linux-2.6.36/scripts/mod/modpost.h
+--- linux-2.6.36.orig/scripts/mod/modpost.h	2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/scripts/mod/modpost.h	2010-11-28 18:33:24.000000000 +0100
+@@ -7,7 +7,2453 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+-#include <elf.h>
++
++
++/* This file defines standard ELF types, structures, and macros.
++   Copyright (C) 1995-1999,2000,2001,2002,2003 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#ifndef _ELF_H
++#define	_ELF_H 1
++
++__BEGIN_DECLS
++
++/* Standard ELF types.  */
++
++#include <stdint.h>
++
++/* Type for a 16-bit quantity.  */
++typedef uint16_t Elf32_Half;
++typedef uint16_t Elf64_Half;
++
++/* Types for signed and unsigned 32-bit quantities.  */
++typedef uint32_t Elf32_Word;
++typedef	int32_t  Elf32_Sword;
++typedef uint32_t Elf64_Word;
++typedef	int32_t  Elf64_Sword;
++
++/* Types for signed and unsigned 64-bit quantities.  */
++typedef uint64_t Elf32_Xword;
++typedef	int64_t  Elf32_Sxword;
++typedef uint64_t Elf64_Xword;
++typedef	int64_t  Elf64_Sxword;
++
++/* Type of addresses.  */
++typedef uint32_t Elf32_Addr;
++typedef uint64_t Elf64_Addr;
++
++/* Type of file offsets.  */
++typedef uint32_t Elf32_Off;
++typedef uint64_t Elf64_Off;
++
++/* Type for section indices, which are 16-bit quantities.  */
++typedef uint16_t Elf32_Section;
++typedef uint16_t Elf64_Section;
++
++/* Type for version symbol information.  */
++typedef Elf32_Hal