---

yaml
---
r: 44403
b: refs/heads/master
c: 28af24b
h: refs/heads/master
i:
  44401: e1a867f
  44399: 49d0ced
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1ef951e8199d1c59f14dbe0fa22974ed57a3b48
+refs/heads/master: 28af24bb8470c7d0573b703a2955548b73a6c066

trunk/.gitignore

@@ -20,7 +20,6 @@
 # Top-level generic files
 #
 tags
-TAGS
 vmlinux*
 System.map
 Module.symvers

trunk/CREDITS

@@ -34,7 +34,6 @@ E: magrawal@nortelnetworks.com
 D: Basic Interphase 5575 driver with UBR and ABR support.
 S: 75 Donald St, Apt 42
 S: Weymouth, MA 02188
-S: USA
 
 N: Dave Airlie
 E: airlied@linux.ie
@@ -45,7 +44,7 @@ S: Longford, Ireland
 S: Sydney, Australia
 
 N: Tigran A. Aivazian
-E: tigran@aivazian.fsnet.co.uk
+E: tigran@veritas.com
 W: http://www.moses.uklinux.net/patches
 D: BFS filesystem
 D: Intel IA32 CPU microcode update support
@@ -203,7 +202,6 @@ S: MS42
 S: Hewlett-Packard
 S: 3404 E Harmony Rd
 S: Fort Collins, CO 80525
-S: USA
 
 N: Arindam Banerji
 E: axb@cse.nd.edu
@@ -446,7 +444,6 @@ E: rbradetich@uswest.net
 D: Linux/PA-RISC hacker
 S: 1200 Goldenrod Dr.
 S: Nampa, Idaho 83686
-S: USA
 
 N: Derrick J. Brashear
 E: shadow@dementia.org
@@ -636,7 +633,6 @@ E: scole@lanl.gov
 E: elenstev@mesatop.com
 D: Various build fixes and kernel documentation.
 S: Los Alamos, New Mexico
-S: USA
 
 N: Hamish Coleman
 E: hamish@zot.apana.org.au
@@ -955,12 +951,6 @@ S: Brevia 1043
 S: S-114 79 Stockholm
 S: Sweden
 
-N: Pekka Enberg
-E: penberg@cs.helsinki.fi
-W: http://www.cs.helsinki.fi/u/penberg/
-D: Various kernel hacks, fixes, and cleanups.
-S: Finland
-
 N: David Engebretsen
 E: engebret@us.ibm.com
 D: Linux port to 64-bit PowerPC architecture
@@ -1630,8 +1620,7 @@ D: fbdev hacking
 
 N: Jesper Juhl
 E: jesper.juhl@gmail.com
-D: Various fixes, cleanups and minor features all over the tree.
-D: Wrote initial version of the hdaps driver (since passed on to others).
+D: Various fixes, cleanups and minor features.
 S: Lemnosvej 1, 3.tv
 S: 2300 Copenhagen S.
 S: Denmark
@@ -1808,14 +1797,6 @@ S: Kruislaan 419
 S: 1098 VA Amsterdam 
 S: The Netherlands
 
-N: Jiri Kosina
-E: jikos@jikos.cz
-E: jkosina@suse.cz
-D: Generic HID layer - original code split, fixes
-D: Various ACPI fixes, keeping correct battery state through suspend
-D: various lockdep annotations, autofs and other random bugfixes
-S: Prague, Czech Republic
-
 N: Gene Kozin
 E: 74604.152@compuserve.com
 W: http://www.sangoma.com
@@ -2021,7 +2002,6 @@ W: http://www.mathematik.uni-stuttgart.de/~floeff
 D: Busmaster driver for HP 10/100 Mbit Network Adapters
 S: University of Stuttgart, Germany and
 S: Ecole Nationale Superieure des Telecommunications, Paris
-S: France
 
 N: Jamie Lokier
 E: jamie@shareable.org
@@ -2191,7 +2171,6 @@ S: Hewlett Packard
 S: MS 42
 S: 3404 E. Harmony Road
 S: Fort Collins, CO 80528
-S: USA
 
 N: Torben Mathiasen
 E: torben.mathiasen@compaq.com
@@ -2248,12 +2227,6 @@ D: tc: HFSC scheduler
 S: Freiburg
 S: Germany
 
-N: Paul E. McKenney
-E: paulmck@us.ibm.com
-W: http://www.rdrop.com/users/paulmck/
-D: RCU and variants
-D: rcutorture module
-
 N: Mike McLagan
 E: mike.mclagan@linux.org
 W: http://www.invlogic.com/~mmclagan
@@ -2504,8 +2477,7 @@ S: Derbyshire DE4 3RL
 S: United Kingdom
 
 N: Ian S. Nelson
-E: nelsonis@earthlink.net
-P: 1024D/00D3D983 3EFD 7B86 B888 D7E2 29B6  9E97 576F 1B97 00D3 D983
+E: ian.nelson@echostar.com
 D: Minor mmap and ide hacks
 S: 1370 Atlantis Ave.
 S: Lafayette CO, 80026
@@ -2606,9 +2578,6 @@ S: Ucitelska 1576
 S: Prague 8
 S: 182 00 Czech Republic
 
-N: Rick Payne
-D: RFC2385 Support for TCP
-
 N: Barak A. Pearlmutter
 E: bap@cs.unm.edu
 W: http://www.cs.unm.edu/~bap/
@@ -2998,10 +2967,6 @@ S: 69 rue Dunois
 S: 75013 Paris
 S: France
 
-N: Dipankar Sarma
-E: dipankar@in.ibm.com
-D: RCU
-
 N: Hannu Savolainen
 E: hannu@opensound.com
 D: Maintainer of the sound drivers until 2.1.x days.
@@ -3314,12 +3279,6 @@ S: 3 Ballow Crescent
 S: MacGregor A.C.T 2615
 S: Australia
 
-N: Josh Triplett
-E: josh@freedesktop.org
-P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87  CA26 189B 9946 D0FE 7AFB
-D: rcutorture maintainer
-D: lock annotations, finding and fixing lock bugs
-
 N: Winfried Tr�mper
 E: winni@xpilot.org
 W: http://www.shop.de/~winni/
@@ -3522,12 +3481,14 @@ D: The Linux Support Team Erlangen
 
 N: David Weinehall
 E: tao@acc.umu.se
-P: 1024D/DC47CA16 7ACE 0FB0 7A74 F994 9B36  E1D1 D14E 8526 DC47 CA16
 W: http://www.acc.umu.se/~tao/
-D: v2.0 kernel maintainer
+W: http://www.acc.umu.se/~mcalinux/
 D: Fixes for the NE/2-driver
 D: Miscellaneous MCA-support
 D: Cleanup of the Config-files
+S: Axtorpsvagen 40:20
+S: S-903 37  UMEA
+S: Sweden
 
 N: Matt Welsh
 E: mdw@metalab.unc.edu
@@ -3587,11 +3548,11 @@ S: Fargo, North Dakota 58122
 S: USA
 
 N: Steven Whitehouse
-E: steve@chygwyn.com
+E: SteveW@ACM.org
 W: http://www.chygwyn.com/~steve
-D: Linux DECnet project
+D: Linux DECnet project: http://www.sucs.swan.ac.uk/~rohan/DECnet/index.html
 D: Minor debugging of other networking protocols.
-D: Misc bug fixes and GFS2 filesystem development
+D: Misc bug fixes and filesystem development
 
 N: Hans-Joachim Widmaier
 E: hjw@zvw.de
@@ -3689,7 +3650,7 @@ S: Portland, OR
 S: USA
 
 N: Michal Wronski
-E: michal.wronski@gmail.com
+E: Michal.Wronski@motorola.com
 D: POSIX message queues fs (with K. Benedyczak)
 S: Krakow
 S: Poland

trunk/Documentation/00-INDEX

@@ -104,6 +104,8 @@ firmware_class/
 	- request_firmware() hotplug interface info.
 floppy.txt
 	- notes and driver options for the floppy disk driver.
+ftape.txt
+	- notes about the floppy tape device driver.
 hayes-esp.txt
 	- info on using the Hayes ESP serial driver.
 highuid.txt

trunk/Documentation/ABI/testing/sysfs-power

@@ -21,7 +21,7 @@ Description:
 		these states.
 
 What:		/sys/power/disk
-Date:		September 2006
+Date:		August 2006
 Contact:	Rafael J. Wysocki <rjw@sisk.pl>
 Description:
 		The /sys/power/disk file controls the operating mode of the
@@ -39,28 +39,13 @@ Description:
 		'reboot' - the memory image will be saved by the kernel and
 		the system will be rebooted.
 
-		Additionally, /sys/power/disk can be used to turn on one of the
-		two testing modes of the suspend-to-disk mechanism: 'testproc'
-		or 'test'.  If the suspend-to-disk mechanism is in the
-		'testproc' mode, writing 'disk' to /sys/power/state will cause
-		the kernel to disable nonboot CPUs and freeze tasks, wait for 5
-		seconds, unfreeze tasks and enable nonboot CPUs.  If it is in
-		the 'test' mode, writing 'disk' to /sys/power/state will cause
-		the kernel to disable nonboot CPUs and freeze tasks, shrink
-		memory, suspend devices, wait for 5 seconds, resume devices,
-		unfreeze tasks and enable nonboot CPUs.  Then, we are able to
-		look in the log messages and work out, for example, which code
-		is being slow and which device drivers are misbehaving.
-
 		The suspend-to-disk method may be chosen by writing to this
 		file one of the accepted strings:
 
 		'firmware'
 		'platform'
 		'shutdown'
 		'reboot'
-		'testproc'
-		'test'
 
 		It will only change to 'firmware' or 'platform' if the system
 		supports that.

trunk/Documentation/Changes

@@ -201,7 +201,7 @@ udev
 ----
 udev is a userspace application for populating /dev dynamically with
 only entries for devices actually present.  udev replaces the basic
-functionality of devfs, while allowing persistent device naming for
+functionality of devfs, while allowing persistant device naming for
 devices.
 
 FUSE