---

yaml
---
r: 24425
b: refs/heads/master
c: 28832e8
h: refs/heads/master
i:
  24423: 2dbba4d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df5b89b323b922f56650b4b4d7c41899b937cf19
+refs/heads/master: 28832e83379afd0b0e83b78ac317290c79ebd496

trunk/CREDITS

@@ -3741,11 +3741,10 @@ D: Mylex DAC960 PCI RAID driver
 D: Miscellaneous kernel fixes
 
 N: Alessandro Zummo
-E: a.zummo@towertech.it
+E: azummo@ita.flashnet.it
+W: http://freepage.logicom.it/azummo/
 D: CMI8330 support is sb_card.c
 D: ISAPnP fixes in sb_card.c
-D: ZyXEL omni.net lcd plus driver
-D: RTC subsystem
 S: Italy
 
 N: Marc Zyngier

trunk/Documentation/block/biodoc.txt

@@ -132,8 +132,18 @@ Some new queue property settings:
 		limit. No highmem default.
 
 	blk_queue_max_sectors(q, max_sectors)
-		Maximum size request you can handle in units of 512 byte
-		sectors. 255 default.
+		Sets two variables that limit the size of the request.
+
+		- The request queue's max_sectors, which is a soft size in
+		in units of 512 byte sectors, and could be dynamically varied
+		by the core kernel.
+
+		- The request queue's max_hw_sectors, which is a hard limit
+		and reflects the maximum size request a driver can handle
+		in units of 512 byte sectors.
+
+		The default for both max_sectors and max_hw_sectors is
+		255. The upper limit of max_sectors is 1024.
 
 	blk_queue_max_phys_segments(q, max_segments)
 		Maximum physical segments you can handle in a request. 128

trunk/Documentation/pnp.txt

@@ -115,9 +115,6 @@ pnp_unregister_protocol
 pnp_register_driver
 - adds a PnP driver to the Plug and Play Layer
 - this includes driver model integration
-- returns zero for success or a negative error number for failure; count
-  calls to the .add() method if you need to know how many devices bind to
-  the driver
 
 pnp_unregister_driver
 - removes a PnP driver from the Plug and Play Layer