---

yaml
---
r: 243231
b: refs/heads/master
c: 1fbc784
h: refs/heads/master
i:
  243229: 46643bd
  243227: 07e9bbb
  243223: a1d416a
  243215: 92973ce
  243199: c9c8f67
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89078d572eb9ce8d4c04264b8b0ba86de0d74c8f
+refs/heads/master: 1fbc78439291627642517f15b9b91f3125588143

trunk/.mailmap

@@ -20,7 +20,6 @@ Andreas Herrmann <aherrman@de.ibm.com>
 Andrew Morton <akpm@osdl.org>
 Andrew Vasquez <andrew.vasquez@qlogic.com>
 Andy Adamson <andros@citi.umich.edu>
-Archit Taneja <archit@ti.com>
 Arnaud Patard <arnaud.patard@rtp-net.org>
 Arnd Bergmann <arnd@arndb.de>
 Axel Dyks <xl@xlsigned.net>
@@ -71,7 +70,6 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
 Linas Vepstas <linas@austin.ibm.com>
 Mark Brown <broonie@sirena.org.uk>
 Matthieu CASTET <castet.matthieu@free.fr>
-Mayuresh Janorkar <mayur@ti.com>
 Michael Buesch <mb@bu3sch.de>
 Michael Buesch <mbuesch@freenet.de>
 Michel Dänzer <michel@tungstengraphics.com>
@@ -80,7 +78,6 @@ Morten Welinder <terra@gnome.org>
 Morten Welinder <welinder@anemone.rentec.com>
 Morten Welinder <welinder@darter.rentec.com>
 Morten Welinder <welinder@troll.com>
-Mythri P K <mythripk@ti.com>
 Nguyen Anh Quynh <aquynh@gmail.com>
 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
 Patrick Mochel <mochel@digitalimplant.org>
@@ -101,7 +98,6 @@ S.Çağlar Onur <caglar@pardus.org.tr>
 Simon Kelley <simon@thekelleys.org.uk>
 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
 Stephen Hemminger <shemminger@osdl.org>
-Sumit Semwal <sumit.semwal@ti.com>
 Tejun Heo <htejun@gmail.com>
 Thomas Graf <tgraf@suug.ch>
 Tony Luck <tony.luck@intel.com>

trunk/Documentation/ABI/stable/sysfs-class-backlight

@@ -34,23 +34,3 @@ Contact:	Richard Purdie <rpurdie@rpsys.net>
 Description:
 		Maximum brightness for <backlight>.
 Users:		HAL
-
-What:		/sys/class/backlight/<backlight>/type
-Date:		September 2010
-KernelVersion:	2.6.37
-Contact:	Matthew Garrett <mjg@redhat.com>
-Description:
-		The type of interface controlled by <backlight>.
-		"firmware": The driver uses a standard firmware interface
-		"platform": The driver uses a platform-specific interface
-		"raw": The driver controls hardware registers directly
-
-		In the general case, when multiple backlight
-		interfaces are available for a single device, firmware
-		control should be preferred to platform control should
-		be preferred to raw control. Using a firmware
-		interface reduces the probability of confusion with
-		the hardware and the OS independently updating the
-		backlight state. Platform interfaces are mostly a
-		holdover from pre-standardisation of firmware
-		interfaces.

trunk/Documentation/ABI/testing/pstore

@@ -1,6 +1,6 @@
 Where:		/dev/pstore/...
-Date:		March 2011
-Kernel Version: 2.6.39
+Date:		January 2011
+Kernel Version: 2.6.38
 Contact:	tony.luck@intel.com
 Description:	Generic interface to platform dependent persistent storage.
 
@@ -11,7 +11,7 @@ Description:	Generic interface to platform dependent persistent storage.
 		of the console log is captured, but other interesting
 		data can also be saved.
 
-		# mount -t pstore -o kmsg_bytes=8000 - /dev/pstore
+		# mount -t pstore - /dev/pstore
 
 		$ ls -l /dev/pstore
 		total 0
@@ -33,9 +33,3 @@ Description:	Generic interface to platform dependent persistent storage.
 		will be saved elsewhere and erased from persistent store
 		soon after boot to free up space ready for the next
 		catastrophe.
-
-		The 'kmsg_bytes' mount option changes the target amount of
-		data saved on each oops/panic. Pstore saves (possibly
-		multiple) files based on the record size of the underlying
-		persistent storage until at least this amount is reached.
-		Default is 10 Kbytes.

trunk/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss

@@ -59,15 +59,3 @@ Kernel Version: 2.6.31
 Contact:	iss_storagedev@hp.com
 Description:	Displays the usage count (number of opens) of logical drive Y
 		of controller X.
-
-Where:		/sys/bus/pci/devices/<dev>/ccissX/resettable
-Date:		February 2011
-Kernel Version:	2.6.38
-Contact:	iss_storagedev@hp.com
-Description:	Value of 1 indicates the controller can honor the reset_devices
-		kernel parameter.  Value of 0 indicates reset_devices cannot be
-		honored.  This is to allow, for example, kexec tools to be able
-		to warn the user if they designate an unresettable device as
-		a dump device, as kdump requires resetting the device in order
-		to work reliably.
-

trunk/Documentation/ABI/testing/sysfs-bus-rbd

@@ -1,6 +1,6 @@
 What:		/sys/bus/rbd/
 Date:		November 2010
-Contact:	Yehuda Sadeh <yehuda@newdream.net>,
+Contact:	Yehuda Sadeh <yehuda@hq.newdream.net>,
 		Sage Weil <sage@newdream.net>
 Description:
 

trunk/Documentation/ABI/testing/sysfs-fs-ext4

@@ -48,7 +48,7 @@ Description:
 		 will have its blocks allocated out of its own unique
 		 preallocation pool.
 
-What:		/sys/fs/ext4/<disk>/inode_readahead_blks
+What:		/sys/fs/ext4/<disk>/inode_readahead
 Date:		March 2008
 Contact:	"Theodore Ts'o" <tytso@mit.edu>
 Description:
@@ -85,14 +85,7 @@ Date:		June 2008
 Contact:	"Theodore Ts'o" <tytso@mit.edu>
 Description:
 		Tuning parameter which (if non-zero) controls the goal
-		inode used by the inode allocator in preference to
-		all other allocation heuristics.  This is intended for
+		inode used by the inode allocator in p0reference to
+		all other allocation hueristics.  This is intended for
 		debugging use only, and should be 0 on production
 		systems.
-
-What:		/sys/fs/ext4/<disk>/max_writeback_mb_bump
-Date:		September 2009
-Contact:	"Theodore Ts'o" <tytso@mit.edu>
-Description:
-		The maximum number of megabytes the writeback code will
-		try to write out before move on to another inode.

trunk/Documentation/ABI/testing/sysfs-fs-pstore

@@ -0,0 +1,7 @@
+What:		/sys/fs/pstore/kmsg_bytes
+Date:		January 2011
+Kernel Version: 2.6.38
+Contact:	"Tony Luck" <tony.luck@intel.com>
+Description:
+		Controls amount of console log that will be saved
+		to persistent store on oops/panic.

trunk/Documentation/ABI/testing/sysfs-platform-eeepc-wmi

@@ -0,0 +1,10 @@
+What:		/sys/devices/platform/eeepc-wmi/cpufv
+Date:		Oct 2010
+KernelVersion:	2.6.37
+Contact:	"Corentin Chary" <corentincj@iksaif.net>
+Description:
+		Change CPU clock configuration (write-only).
+		There are three available clock configuration:
+		    * 0 -> Super Performance Mode
+		    * 1 -> High Performance Mode
+		    * 2 -> Power Saving Mode

trunk/Documentation/Changes

@@ -35,7 +35,7 @@ o  util-linux             2.10o                   # fdformat --version
 o  module-init-tools      0.9.10                  # depmod -V
 o  e2fsprogs              1.41.4                  # e2fsck -V
 o  jfsutils               1.1.3                   # fsck.jfs -V
-o  reiserfsprogs          3.6.3                   # reiserfsck -V
+o  reiserfsprogs          3.6.3                   # reiserfsck -V 2>&1|grep reiserfsprogs
 o  xfsprogs               2.6.0                   # xfs_db -V
 o  squashfs-tools         4.0                     # mksquashfs -version
 o  btrfs-progs            0.18                    # btrfsck
@@ -46,9 +46,9 @@ o  isdn4k-utils           3.1pre1                 # isdnctrl 2>&1|grep version
 o  nfs-utils              1.0.5                   # showmount --version
 o  procps                 3.2.0                   # ps --version
 o  oprofile               0.9                     # oprofiled --version
-o  udev                   081                     # udevd --version
-o  grub                   0.93                    # grub --version || grub-install --version
-o  mcelog                 0.6                     # mcelog --version
+o  udev                   081                     # udevinfo -V
+o  grub                   0.93                    # grub --version
+o  mcelog		  0.6
 o  iptables               1.4.2                   # iptables -V
 
 

trunk/Documentation/CodingStyle

@@ -168,13 +168,6 @@ Do not unnecessarily use braces where a single statement will do.
 if (condition)
 	action();
 
-and
-
-if (condition)
-	do_this();
-else
-	do_that();
-
 This does not apply if one branch of a conditional statement is a single
 statement. Use braces in both branches.
 

trunk/Documentation/DocBook/Makefile

@@ -53,9 +53,7 @@ MAN := $(patsubst %.xml, %.9, $(BOOKS))
 mandocs: $(MAN)
 
 build_images = mkdir -p $(objtree)/Documentation/DocBook/media/ && \
-	       cp $(srctree)/Documentation/DocBook/dvb/*.png \
-	          $(srctree)/Documentation/DocBook/v4l/*.gif \
-		  $(objtree)/Documentation/DocBook/media/
+	       cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(objtree)/Documentation/DocBook/media/
 
 xmldoclinks:
 ifneq ($(objtree),$(srctree))