---

yaml --- r: 297370 b: refs/heads/master c: 3fa016a h: refs/heads/master v: v3
git-mirror · Mar 29, 2012 · 8b662bb · 8b662bb
1 parent 416cae9
commit 8b662bb
Show file tree

Hide file tree

Showing 3,280 changed files with 37,231 additions and 75,500 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5174fa3a7f4f8f150bfa3b917c92608953dfa0f
+refs/heads/master: 3fa016a0b5c5237e9c387fc3249592b2cb5391c6
diff --git a/trunk/Documentation/ABI/testing/sysfs-block-dm b/trunk/Documentation/ABI/testing/sysfs-block-dm
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-rpmsg b/trunk/Documentation/ABI/testing/sysfs-bus-rpmsg
diff --git a/trunk/Documentation/ABI/testing/sysfs-driver-samsung-laptop b/trunk/Documentation/ABI/testing/sysfs-driver-samsung-laptop
@@ -17,21 +17,3 @@ Description:	Some Samsung laptops have different "performance levels"
 		Specifically, not all support the "overclock" option,
 		and it's still unknown if this value even changes
 		anything, other than making the user feel a bit better.
-
-What:		/sys/devices/platform/samsung/battery_life_extender
-Date:		December 1, 2011
-KernelVersion:	3.3
-Contact:	Corentin Chary <corentin.chary@gmail.com>
-Description:	Max battery charge level can be modified, battery cycle
-		life can be extended by reducing the max battery charge
-		level.
-		0 means normal battery mode (100% charge)
-		1 means battery life extender mode (80% charge)
-
-What:		/sys/devices/platform/samsung/usb_charge
-Date:		December 1, 2011
-KernelVersion:	3.3
-Contact:	Corentin Chary <corentin.chary@gmail.com>
-Description:	Use your USB ports to charge devices, even
-		when your laptop is powered off.
-		1 means enabled, 0 means disabled.
diff --git a/trunk/Documentation/Makefile b/trunk/Documentation/Makefile
@@ -1,3 +1,3 @@
 obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
 	filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \
-	pcmcia/ spi/ timers/ watchdog/src/
+	pcmcia/ spi/ timers/ vm/ watchdog/src/
diff --git a/trunk/Documentation/clk.txt b/trunk/Documentation/clk.txt