---

yaml --- r: 275357 b: refs/heads/master c: 241fa6e h: refs/heads/master i: 275355: 7790338 v: v3
git-mirror · Nov 7, 2011 · 8c595e2 · 8c595e2
1 parent 81b49fd
commit 8c595e2
Show file tree

Hide file tree

Showing 5,175 changed files with 65,352 additions and 147,978 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3455229fd6a51978439f9c6256d677b745fad06b
+refs/heads/master: 241fa6e42f5462a82f00ddf5169628a8c3976548
diff --git a/trunk/Documentation/ABI/stable/sysfs-acpi-pmprofile b/trunk/Documentation/ABI/stable/sysfs-acpi-pmprofile
diff --git a/trunk/Documentation/ABI/testing/debugfs-ideapad b/trunk/Documentation/ABI/testing/debugfs-ideapad
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss b/trunk/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss
@@ -71,10 +71,3 @@ Description:	Value of 1 indicates the controller can honor the reset_devices
 		a dump device, as kdump requires resetting the device in order
 		to work reliably.
 
-Where:		/sys/bus/pci/devices/<dev>/ccissX/transport_mode
-Date:		July 2011
-Kernel Version:	3.0
-Contact:	iss_storagedev@hp.com
-Description:	Value of "simple" indicates that the controller has been placed
-		in "simple mode". Value of "performant" indicates that the
-		controller has been placed in "performant mode".
diff --git a/trunk/Documentation/ABI/testing/sysfs-platform-ideapad-laptop b/trunk/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
@@ -5,4 +5,19 @@ Contact:	"Ike Panhc <ike.pan@canonical.com>"
 Description:
 		Control the power of camera module. 1 means on, 0 means off.
 
+What:		/sys/devices/platform/ideapad/cfg
+Date:		Jun 2011
+KernelVersion:	3.1
+Contact:	"Ike Panhc <ike.pan@canonical.com>"
+Description:
+		Ideapad capability bits.
+		Bit 8-10: 1 - Intel graphic only
+		          2 - ATI graphic only
+		          3 - Nvidia graphic only
+		          4 - Intel and ATI graphic
+		          5 - Intel and Nvidia graphic
+		Bit 16: Bluetooth exist (1 for exist)
+		Bit 17: 3G exist (1 for exist)
+		Bit 18: Wifi exist (1 for exist)
+		Bit 19: Camera exist (1 for exist)
 
diff --git a/trunk/Documentation/CodingStyle b/trunk/Documentation/CodingStyle
@@ -166,8 +166,8 @@ if (condition)
 else
 	do_that();
 
-This does not apply if only one branch of a conditional statement is a single
-statement; in the latter case use braces in both branches:
+This does not apply if one branch of a conditional statement is a single
+statement. Use braces in both branches.
 
 if (condition) {
 	do_this();

diff --git a/trunk/Documentation/DMA-API.txt b/trunk/Documentation/DMA-API.txt
@@ -50,13 +50,6 @@ specify the GFP_ flags (see kmalloc) for the allocation (the
 implementation may choose to ignore flags that affect the location of
 the returned memory, like GFP_DMA).
 
-void *
-dma_zalloc_coherent(struct device *dev, size_t size,
-			     dma_addr_t *dma_handle, gfp_t flag)
-
-Wraps dma_alloc_coherent() and also zeroes the returned memory if the
-allocation attempt succeeded.
-
 void
 dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
 			   dma_addr_t dma_handle)