---

yaml
---
r: 95511
b: refs/heads/master
c: 6afe1a1
h: refs/heads/master
i:
  95509: 459b485
  95507: 353a72e
  95503: c991e35
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9448b0d43e5509c6b7baca02510a92ef2de6e328
+refs/heads/master: 6afe1a1fe8ff83f6ac2726b04665e76ba7b14f3e

trunk/.gitignore

@@ -27,7 +27,6 @@ TAGS
 vmlinux*
 !vmlinux.lds.S
 System.map
-Module.markers
 Module.symvers
 !.gitignore
 

trunk/CREDITS

@@ -403,8 +403,6 @@ D: Linux CD and Support Giveaway List
 N: Erik Inge Bolsø
 E: knan@mo.himolde.no
 D: Misc kernel hacks
-D: Updated PC speaker driver for 2.3
-S: Norway
 
 N: Andreas E. Bombe
 E: andreas.bombe@munich.netsurf.de
@@ -3118,12 +3116,6 @@ S: Post Office Box 64132
 S: Sunnyvale, California 94088-4132
 S: USA
 
-N: Stas Sergeev
-E: stsp@users.sourceforge.net
-D: PCM PC-Speaker driver
-D: misc fixes
-S: Russia
-
 N: Simon Shapiro
 E: shimon@i-Connect.Net
 W: http://www.-i-Connect.Net/~shimon

trunk/Documentation/00-INDEX

@@ -25,6 +25,8 @@ DMA-API.txt
 	- DMA API, pci_ API & extensions for non-consistent memory machines.
 DMA-ISA-LPC.txt
 	- How to do DMA with ISA (and LPC) devices.
+DMA-mapping.txt
+	- info for PCI drivers using DMA portably across all platforms.
 DocBook/
 	- directory with DocBook templates etc. for kernel documentation.
 HOWTO
@@ -41,6 +43,8 @@ ManagementStyle
 	- how to (attempt to) manage kernel hackers.
 MSI-HOWTO.txt
 	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
+PCIEBUS-HOWTO.txt
+	- a guide describing the PCI Express Port Bus driver.
 RCU/
 	- directory with info on RCU (read-copy update).
 README.DAC960
@@ -163,8 +167,10 @@ highuid.txt
 	- notes on the change from 16 bit to 32 bit user/group IDs.
 hpet.txt
 	- High Precision Event Timer Driver for Linux.
-timers/
-	- info on the timer related topics
+hrtimer/
+	- info on the timer_stats debugging facility for timer (ab)use.
+hrtimers/
+	- info on the hrtimers subsystem for high-resolution kernel timers.
 hw_random.txt
 	- info on Linux support for random number generator in i8xx chipsets.
 hwmon/
@@ -281,6 +287,12 @@ parport.txt
 	- how to use the parallel-port driver.
 parport-lowlevel.txt
 	- description and usage of the low level parallel port functions.
+pci-error-recovery.txt
+	- info on PCI error recovery.
+pci.txt
+	- info on the PCI subsystem for device driver authors.
+pcieaer-howto.txt
+	- the PCI Express Advanced Error Reporting Driver Guide HOWTO.
 pcmcia/
 	- info on the Linux PCMCIA driver.
 pi-futex.txt
@@ -329,6 +341,8 @@ sgi-visws.txt
 	- short blurb on the SGI Visual Workstations.
 sh/
 	- directory with info on porting Linux to a new architecture.
+smart-config.txt
+	- description of the Smart Config makefile feature.
 sound/
 	- directory with info on sound card support.
 sparc/