diff --git a/patch.sh b/patch.sh
index f6b91240bd95b4ea366a6ab80f206f0e0c849aec..da4bb101bc79d07a99a2c9ecd9fd5869042cc13f 100644
--- a/patch.sh
+++ b/patch.sh
@@ -65,27 +65,28 @@ echo "dspbridge from for-next"
function omap_fixes {
echo "omap fixes"
-patch -s -p1 < "${DIR}/patches/fixes/0001-OMAP-fix-compilation-error.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0002-ARM-OMAP2-Add-missing-include-of-linux-gpio.h.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0003-OMAP2-Fix-9-section-mismatch-es-warnings-from-mach-o.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0004-arm-omap3-cm-t3517-fix-section-mismatch-warning.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0005-OMAP-SRAM-Fix-warning-format-08lx-expects-type-long-.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0006-OMAP2-mux-fix-compilation-warnings.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0007-arch-arm-mach-omap1-dma.c-Invert-calls-to-platform_d.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0008-OMAP-iovmm-fix-SW-flags-passed-by-user.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0009-OMAP4-fix-return-value-of-omap4_l3_init.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0010-ARM-omap2-mux-Allow-board-mux-settings-to-be-NULL.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0011-ARM-omap4-Pass-core-and-wakeup-mux-tables-to-omap4_m.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0012-ARM-OMAP2-Add-missing-iounmap-in-omap4430_phy_init.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0013-arm-omap2plus-fix-ads7846-pendown-gpio-request.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0014-ARM-OMAP4-MMC-no-regulator-off-during-probe-for-eMMC.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0015-omap-rx51-Set-regulator-V28_A-always-on.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0016-omap-rx51-Don-t-power-up-speaker-amplifier-at-bootup.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0017-arm-omap3-beagle-Ensure-msecure-is-mux-d-to-be-able-.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0018-omap3-Free-Beagle-rev-gpios-when-they-are-read-so-ot.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0019-omap4-hwmod-Enable-the-keypad.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0020-arm-omap2plus-move-NAND_BLOCK_SIZE-out-of-boards.patch"
-patch -s -p1 < "${DIR}/patches/fixes/0021-ARM-OMAP4-MMC-increase-delay-for-pbias.patch"
+#3.0-rc3
+#patch -s -p1 < "${DIR}/patches/fixes/0001-OMAP-fix-compilation-error.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0002-ARM-OMAP2-Add-missing-include-of-linux-gpio.h.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0003-OMAP2-Fix-9-section-mismatch-es-warnings-from-mach-o.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0004-arm-omap3-cm-t3517-fix-section-mismatch-warning.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0005-OMAP-SRAM-Fix-warning-format-08lx-expects-type-long-.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0006-OMAP2-mux-fix-compilation-warnings.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0007-arch-arm-mach-omap1-dma.c-Invert-calls-to-platform_d.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0008-OMAP-iovmm-fix-SW-flags-passed-by-user.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0009-OMAP4-fix-return-value-of-omap4_l3_init.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0010-ARM-omap2-mux-Allow-board-mux-settings-to-be-NULL.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0011-ARM-omap4-Pass-core-and-wakeup-mux-tables-to-omap4_m.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0012-ARM-OMAP2-Add-missing-iounmap-in-omap4430_phy_init.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0013-arm-omap2plus-fix-ads7846-pendown-gpio-request.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0014-ARM-OMAP4-MMC-no-regulator-off-during-probe-for-eMMC.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0015-omap-rx51-Set-regulator-V28_A-always-on.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0016-omap-rx51-Don-t-power-up-speaker-amplifier-at-bootup.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0017-arm-omap3-beagle-Ensure-msecure-is-mux-d-to-be-able-.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0018-omap3-Free-Beagle-rev-gpios-when-they-are-read-so-ot.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0019-omap4-hwmod-Enable-the-keypad.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0020-arm-omap2plus-move-NAND_BLOCK_SIZE-out-of-boards.patch"
+#patch -s -p1 < "${DIR}/patches/fixes/0021-ARM-OMAP4-MMC-increase-delay-for-pbias.patch"
}
diff --git a/patches/defconfig b/patches/defconfig
index 8ea58b3d62fa4614b7e60a581e2b7f736bbc08bf..c0c65180edc9e8355f6d0503df1031e5dcea520a 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.0-rc1 Kernel Configuration
+# Linux/arm 3.0.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1680,8 +1680,11 @@ CONFIG_PPP_MPPE=m
CONFIG_PPPOE=m
CONFIG_PPPOATM=m
# CONFIG_PPPOL2TP is not set
-# CONFIG_SLIP is not set
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -2007,10 +2010,6 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_BASIC_MMIO is not set
# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_EXYNOS4 is not set
-# CONFIG_GPIO_PLAT_SAMSUNG is not set
-# CONFIG_GPIO_S5PC100 is not set
-# CONFIG_GPIO_S5PV210 is not set
# CONFIG_GPIO_PL061 is not set
#
@@ -3286,7 +3285,6 @@ CONFIG_UIO=m
CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
# CONFIG_VIDEO_TM6000 is not set
# CONFIG_USBIP_CORE is not set
# CONFIG_W35UND is not set
diff --git a/patches/no_devtmps-defconfig b/patches/no_devtmps-defconfig
index f2af8987f949f21a088b8e9b8419d6ec0a909824..1ebe956a169dfc900b6215ee7f80a2854ff66f23 100644
--- a/patches/no_devtmps-defconfig
+++ b/patches/no_devtmps-defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.0-rc1 Kernel Configuration
+# Linux/arm 3.0.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1679,8 +1679,11 @@ CONFIG_PPP_MPPE=m
CONFIG_PPPOE=m
CONFIG_PPPOATM=m
# CONFIG_PPPOL2TP is not set
-# CONFIG_SLIP is not set
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -2006,10 +2009,6 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_BASIC_MMIO is not set
# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_EXYNOS4 is not set
-# CONFIG_GPIO_PLAT_SAMSUNG is not set
-# CONFIG_GPIO_S5PC100 is not set
-# CONFIG_GPIO_S5PV210 is not set
# CONFIG_GPIO_PL061 is not set
#
@@ -3285,7 +3284,6 @@ CONFIG_UIO=m
CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
# CONFIG_VIDEO_TM6000 is not set
# CONFIG_USBIP_CORE is not set
# CONFIG_W35UND is not set
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 1839eb127471d28cb6dacbd966de40a5c505c8e2..09457d5b97567411990e7f85cc2615d26986c05f 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.0-rc2 Kernel Configuration
+# Linux/arm 3.0.0-rc3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1265,10 +1265,6 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_BASIC_MMIO is not set
# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_EXYNOS4 is not set
-# CONFIG_GPIO_PLAT_SAMSUNG is not set
-# CONFIG_GPIO_S5PC100 is not set
-# CONFIG_GPIO_S5PV210 is not set
#
# I2C GPIO expanders:
diff --git a/patches/sgx/0001-OMAP3-SGX-enable-driver-building.patch b/patches/sgx/0001-OMAP3-SGX-enable-driver-building.patch
index 8041dfc305ce0b6a4dc6c86e76644d10e39fa528..4e9a35ac9003dfef0c80e945d79b1239d302dccb 100644
--- a/patches/sgx/0001-OMAP3-SGX-enable-driver-building.patch
+++ b/patches/sgx/0001-OMAP3-SGX-enable-driver-building.patch
@@ -3,6 +3,7 @@ From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 17 Aug 2010 09:43:20 -0500
Subject: [PATCH] OMAP3 SGX enable driver building
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
drivers/staging/Kconfig | 2 +
drivers/staging/Makefile | 1 +
@@ -14,29 +15,28 @@ Subject: [PATCH] OMAP3 SGX enable driver building
create mode 100644 drivers/staging/omap3-sgx/Kconfig
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
-index 984a754..f873c94 100644
+index 196284d..d293f06 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
-@@ -147,5 +147,7 @@ source "drivers/staging/mrst-touchscreen/Kconfig"
+@@ -160,4 +160,6 @@ source "drivers/staging/mei/Kconfig"
- source "drivers/staging/msm/Kconfig"
+ source "drivers/staging/nvec/Kconfig"
+source "drivers/staging/omap3-sgx/Kconfig"
+
- endif # !STAGING_EXCLUDE_BUILD
endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
-index 9fa2513..5a154f1 100644
+index fa41b9c..87b91b3 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
-@@ -48,6 +48,7 @@ obj-$(CONFIG_FB_SM7XX) += sm7xx/
- obj-$(CONFIG_DT3155) += dt3155/
+@@ -50,6 +50,7 @@ obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
+ obj-$(CONFIG_FB_SM7XX) += sm7xx/
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
obj-$(CONFIG_CRYSTALHD) += crystalhd/
+obj-$(CONFIG_OMAP3_SGX) += omap3-sgx/
obj-$(CONFIG_CXT1E1) += cxt1e1/
- obj-$(CONFIG_TI_ST) += ti-st/
- obj-$(CONFIG_ADIS16255) += adis16255/
+ obj-$(CONFIG_FB_XGI) += xgifb/
+ obj-$(CONFIG_MSM_STAGING) += msm/
diff --git a/drivers/staging/omap3-sgx/Kbuild b/drivers/staging/omap3-sgx/Kbuild
index 875de78..2e482f0 100644
--- a/drivers/staging/omap3-sgx/Kbuild
@@ -231,7 +231,7 @@ index 52a6c65..52e5ba7 100644
obj-m := bufferclass_ti.o
bufferclass_ti-y := bc_cat.o
diff --git a/drivers/staging/omap3-sgx/services4/3rdparty/dc_omap3430_linux/Kbuild b/drivers/staging/omap3-sgx/services4/3rdparty/dc_omap3430_linux/Kbuild
-index eca3626..315ac8d 100644
+index eca3626..315ac8d7 100644
--- a/drivers/staging/omap3-sgx/services4/3rdparty/dc_omap3430_linux/Kbuild
+++ b/drivers/staging/omap3-sgx/services4/3rdparty/dc_omap3430_linux/Kbuild
@@ -4,13 +4,12 @@ SUPPORT_TI_DSS_FW = 0
@@ -255,5 +255,5 @@ index eca3626..315ac8d 100644
obj-m := omaplfb.o
omaplfb-y := omaplfb_displayclass.o omaplfb_linux.o
--
-1.7.0.4
+1.7.4.1
diff --git a/version.sh b/version.sh
index 30efd9e809c8df6e6623b749a131a46eafcd31c0..94f5bee447acfac3899614043847d4f7220aef7b 100644
--- a/version.sh
+++ b/version.sh
@@ -6,7 +6,7 @@ KERNEL_REL=2.6.39
#STABLE_PATCH=1
#PRE_RC=2.6.39-git18
RC_KERNEL=3.0
-RC_PATCH=-rc2
+RC_PATCH=-rc3
ABI=0
if [ "${NO_DEVTMPS}" ] ; then