---

yaml --- r: 320549 b: refs/heads/master c: 931efdf h: refs/heads/master i: 320547: 4884088 v: v3
git-mirror · Jul 14, 2012 · 7f8edea · 7f8edea
1 parent f2a5100
commit 7f8edea
Show file tree

Hide file tree

Showing 12,770 changed files with 550,639 additions and 990,536 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dbb35b0a74b44b2a48a5373d48074c5aa69fdf5
+refs/heads/master: 931efdf58bd83af8d0578a6cc53421675daf6d41
diff --git a/trunk/.mailmap b/trunk/.mailmap
@@ -111,8 +111,5 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Uwe Kleine-König <ukl@pengutronix.de>
 Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
-Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
 Takashi YOSHII <takashi.yoshii.zj@renesas.com>
 Yusuke Goda <goda.yusuke@renesas.com>
-Gustavo Padovan <gustavo@las.ic.unicamp.br>
-Gustavo Padovan <padovan@profusion.mobi>
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer
 D: Author of the longest-living linux bug
 
 N: Jonathan Woithe
-E: jwoithe@just42.net
-W: http:/www.just42.net/jwoithe
+E: jwoithe@physics.adelaide.edu.au
+W: http://www.physics.adelaide.edu.au/~jwoithe
 D: ALS-007 sound card extensions to Sound Blaster driver
 S: 20 Jordan St
 S: Valley View, SA 5093

diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX
@@ -218,6 +218,8 @@ m68k/
 	- directory with info about Linux on Motorola 68k architecture.
 magic-number.txt
 	- list of magic numbers used to mark/protect kernel data structures.
+mca.txt
+	- info on supporting Micro Channel Architecture (e.g. PS/2) systems.
 md.txt
 	- info on boot arguments for the multiple devices driver.
 memory-barriers.txt

diff --git a/trunk/Documentation/ABI/removed/ip_queue b/trunk/Documentation/ABI/removed/ip_queue
diff --git a/trunk/Documentation/ABI/stable/sysfs-bus-firewire b/trunk/Documentation/ABI/stable/sysfs-bus-firewire
@@ -39,17 +39,6 @@ Users:		udev rules to set ownership and access permissions or ACLs of
 		/dev/fw[0-9]+ character device files
 
 
-What:		/sys/bus/firewire/devices/fw[0-9]+/is_local
-Date:		July 2012
-KernelVersion:	3.6
-Contact:	linux1394-devel@lists.sourceforge.net
-Description:
-		IEEE 1394 node device attribute.
-		Read-only and immutable.
-Values:		1: The sysfs entry represents a local node (a controller card).
-		0: The sysfs entry represents a remote node.
-
-
 What:		/sys/bus/firewire/devices/fw[0-9]+[.][0-9]+/
 Date:		May 2007
 KernelVersion:	2.6.22

diff --git a/trunk/Documentation/ABI/stable/sysfs-driver-w1_ds28e04 b/trunk/Documentation/ABI/stable/sysfs-driver-w1_ds28e04
diff --git a/trunk/Documentation/ABI/stable/vdso b/trunk/Documentation/ABI/stable/vdso
@@ -24,4 +24,4 @@ though.
 
 (As of this writing, this ABI documentation as been confirmed for x86_64.
  The maintainers of the other vDSO-using architectures should confirm
- that it is correct for their architecture.)
+ that it is correct for their architecture.)
diff --git a/trunk/Documentation/ABI/testing/debugfs-pfo-nx-crypto b/trunk/Documentation/ABI/testing/debugfs-pfo-nx-crypto
diff --git a/trunk/Documentation/ABI/testing/dev-kmsg b/trunk/Documentation/ABI/testing/dev-kmsg
diff --git a/trunk/Documentation/ABI/testing/sysfs-block-rssd b/trunk/Documentation/ABI/testing/sysfs-block-rssd
@@ -1,5 +1,18 @@
+What:           /sys/block/rssd*/registers
+Date:           March 2012
+KernelVersion:  3.3
+Contact:        Asai Thambi S P <asamymuthupa@micron.com>
+Description:    This is a read-only file. Dumps below driver information and
+                hardware registers.
+                    - S ACTive
+                    - Command Issue
+                    - Allocated
+                    - Completed
+                    - PORT IRQ STAT
+                    - HOST IRQ STAT
+
 What:           /sys/block/rssd*/status
 Date:           April 2012
 KernelVersion:  3.4
 Contact:        Asai Thambi S P <asamymuthupa@micron.com>
-Description:    This is a read-only file. Indicates the status of the device.
+Description:   This is a read-only file. Indicates the status of the device.
diff --git a/trunk/Documentation/ABI/testing/sysfs-block-zram b/trunk/Documentation/ABI/testing/sysfs-block-zram
@@ -96,4 +96,4 @@ Description:
 		overhead, allocated for this disk. So, allocator space
 		efficiency can be calculated using compr_data_size and this
 		statistic.
-		Unit: bytes
+		Unit: bytes
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-fcoe b/trunk/Documentation/ABI/testing/sysfs-bus-fcoe
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533 b/trunk/Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523 b/trunk/Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523