merge to 2.6.39-git12

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

patches/defconfig

 #
 # Automatically generated make config: don't edit
-# Linux/arm 2.6.39-git11 Kernel Configuration
-# Thu May 26 14:21:05 2011
+# Linux/arm 2.6.39-git12 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1146,6 +1145,7 @@ CONFIG_RFKILL=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_REGULATOR=y
+# CONFIG_RFKILL_GPIO is not set
 CONFIG_NET_9P=m
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_CAIF=m
@@ -2119,6 +2119,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
 # CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -3161,6 +3162,7 @@ CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_OMAP=m
 CONFIG_MMC_OMAP_HS=y
 # CONFIG_MMC_DW is not set
+# CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -3446,8 +3448,8 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
-CONFIG_TMPFS_XATTR=y
 CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
 CONFIG_MISC_FILESYSTEMS=y

patches/no_devtmps-defconfig

 #
 # Automatically generated make config: don't edit
-# Linux/arm 2.6.39-git11 Kernel Configuration
-# Thu May 26 14:21:05 2011
+# Linux/arm 2.6.39-git12 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1146,6 +1145,7 @@ CONFIG_RFKILL=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_REGULATOR=y
+# CONFIG_RFKILL_GPIO is not set
 CONFIG_NET_9P=m
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_CAIF=m
@@ -2118,6 +2118,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
 # CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -3160,6 +3161,7 @@ CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_OMAP=m
 CONFIG_MMC_OMAP_HS=y
 # CONFIG_MMC_DW is not set
+# CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -3445,8 +3447,8 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
-CONFIG_TMPFS_XATTR=y
 CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
 CONFIG_MISC_FILESYSTEMS=y

patches/ref_omap2plus_defconfig

 #
 # Automatically generated make config: don't edit
-# Linux/arm 2.6.39-git11 Kernel Configuration
-# Thu May 26 14:20:50 2011
+# Linux/arm 2.6.39-git12 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1396,6 +1395,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
 # CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
@@ -1902,6 +1902,7 @@ CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 # CONFIG_MMC_SPI is not set
 # CONFIG_MMC_DW is not set
+# CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
@@ -2048,6 +2049,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_TMPFS_XATTR is not set
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set

version.sh

@@ -4,7 +4,7 @@ unset BUILD
 
 KERNEL_REL=2.6.39
 #STABLE_PATCH=1
-PRE_RC=2.6.39-git11
+PRE_RC=2.6.39-git12
 #RC_KERNEL=2.6.39
 #RC_PATCH=-rc7
 ABI=0