---

yaml --- r: 231847 b: refs/heads/master c: 228dd54 h: refs/heads/master i: 231845: 995b1cc 231843: 04b474a 231839: b237b08 v: v3
git-mirror · Jan 14, 2011 · f9b9dcf · f9b9dcf
1 parent f926538
commit f9b9dcf
Show file tree

Hide file tree

Showing 758 changed files with 6,360 additions and 11,019 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 321051f5daf059e7290aa7d60af55482c8bb896a
+refs/heads/master: 228dd545147a07c5e81e4732ad0e829d19ce5daa
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);