---

yaml
---
r: 230953
b: refs/heads/master
c: 106d1a0
h: refs/heads/master
i:
  230951: f4bb1ce
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 156d821270e131dee7d89fc4aa385f0f9b1900ea
+refs/heads/master: 106d1a0ab2a354b97df3e232be7dedbfaf8e901d

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.

trunk/Documentation/IPMI.txt

@@ -533,33 +533,6 @@ completion during sending a panic event.
 Other Pieces
 ------------
 
-Get the detailed info related with the IPMI device
---------------------------------------------------
-
-Some users need more detailed information about a device, like where
-the address came from or the raw base device for the IPMI interface.
-You can use the IPMI smi_watcher to catch the IPMI interfaces as they
-come or go, and to grab the information, you can use the function
-ipmi_get_smi_info(), which returns the following structure:
-
-struct ipmi_smi_info {
-	enum ipmi_addr_src addr_src;
-	struct device *dev;
-	union {
-		struct {
-			void *acpi_handle;
-		} acpi_info;
-	} addr_info;
-};
-
-Currently special info for only for SI_ACPI address sources is
-returned.  Others may be added as necessary.
-
-Note that the dev pointer is included in the above structure, and
-assuming ipmi_smi_get_info returns success, you must call put_device
-on the dev pointer.
-
-
 Watchdog
 --------
 

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);