---

yaml --- r: 230933 b: refs/heads/master c: c9aa308 h: refs/heads/master i: 230931: f5ef763 v: v3
git-mirror · Dec 14, 2010 · 63fa2c4 · 63fa2c4
1 parent 4ce0480
commit 63fa2c4
Show file tree

Hide file tree

Showing 774 changed files with 6,423 additions and 9,151 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e0c20bceb611917a7546172ac617d07e5af0cfa
+refs/heads/master: c9aa308fd5c373faeda588cfb02b04f116904613
diff --git a/trunk/Documentation/ABI/stable/thermal-notification b/trunk/Documentation/ABI/stable/thermal-notification
diff --git a/trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop b/trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop
@@ -47,20 +47,6 @@ Date:		January 2007
 KernelVersion:	2.6.20
 Contact:	"Corentin Chary" <corentincj@iksaif.net>
 Description:
-		Control the wlan device. 1 means on, 0 means off.
+		Control the bluetooth device. 1 means on, 0 means off.
 		This may control the led, the device or both.
 Users:		Lapsus
-
-What:		/sys/devices/platform/asus_laptop/wimax
-Date:		October 2010
-KernelVersion:	2.6.37
-Contact:	"Corentin Chary" <corentincj@iksaif.net>
-Description:
-		Control the wimax device. 1 means on, 0 means off.
-
-What:		/sys/devices/platform/asus_laptop/wwan
-Date:		October 2010
-KernelVersion:	2.6.37
-Contact:	"Corentin Chary" <corentincj@iksaif.net>
-Description:
-		Control the wwan (3G) device. 1 means on, 0 means off.
diff --git a/trunk/Documentation/ABI/testing/sysfs-platform-eeepc-wmi b/trunk/Documentation/ABI/testing/sysfs-platform-eeepc-wmi
diff --git a/trunk/Documentation/accounting/getdelays.c b/trunk/Documentation/accounting/getdelays.c
@@ -516,7 +516,6 @@ int main(int argc, char *argv[])
 			default:
 				fprintf(stderr, "Unknown nla_type %d\n",
 					na->nla_type);
-			case TASKSTATS_TYPE_NULL:
 				break;
 			}
 			na = (struct nlattr *) (GENLMSG_DATA(&msg) + len);

diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt
@@ -232,17 +232,6 @@ Who:	Zhang Rui <rui.zhang@intel.com>
 
 ---------------------------
 
-What:	CONFIG_ACPI_PROCFS_POWER
-When:	2.6.39
-Why:	sysfs I/F for ACPI power devices, including AC and Battery,
-        has been working in upstream kenrel since 2.6.24, Sep 2007.
-	In 2.6.37, we make the sysfs I/F always built in and this option
-	disabled by default.
-	Remove this option and the ACPI power procfs interface in 2.6.39.
-Who:	Zhang Rui <rui.zhang@intel.com>
-
----------------------------
-
 What:	/proc/acpi/button
 When:	August 2007
 Why:	/proc/acpi/button has been replaced by events to the input layer