---

yaml --- r: 110313 b: refs/heads/master c: 36a0330 h: refs/heads/master i: 110311: 86cb27a v: v3
git-mirror · Jul 26, 2008 · 834b8ff · 834b8ff
1 parent 9d93cb1
commit 834b8ff
Show file tree

Hide file tree

Showing 8,326 changed files with 145,068 additions and 280,352 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0962f402af1bb0b53ccee626785d202a10c12fff
+refs/heads/master: 36a033082b5243d45d508c5ccd47a754edbc6821
diff --git a/trunk/.mailmap b/trunk/.mailmap
@@ -96,6 +96,4 @@ Tejun Heo <htejun@gmail.com>
 Thomas Graf <tgraf@suug.ch>
 Tony Luck <tony.luck@intel.com>
 Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
-Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
-Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX
@@ -89,6 +89,8 @@ cciss.txt
 	- info, major/minor #'s for Compaq's SMART Array Controllers.
 cdrom/
 	- directory with information on the CD-ROM drivers that Linux has.
+cli-sti-removal.txt
+	- cli()/sti() removal guide.
 computone.txt
 	- info on Computone Intelliport II/Plus Multiport Serial Driver.
 connector/

diff --git a/trunk/Documentation/ABI/testing/sysfs-class-regulator b/trunk/Documentation/ABI/testing/sysfs-class-regulator
diff --git a/trunk/Documentation/ABI/testing/sysfs-firmware-sgi_uv b/trunk/Documentation/ABI/testing/sysfs-firmware-sgi_uv
diff --git a/trunk/Documentation/ABI/testing/sysfs-gpio b/trunk/Documentation/ABI/testing/sysfs-gpio
diff --git a/trunk/Documentation/DMA-mapping.txt b/trunk/Documentation/DMA-mapping.txt
@@ -740,7 +740,7 @@ failure can be determined by:
 	dma_addr_t dma_handle;
 
 	dma_handle = pci_map_single(pdev, addr, size, direction);
-	if (pci_dma_mapping_error(pdev, dma_handle)) {
+	if (pci_dma_mapping_error(dma_handle)) {
 		/*
 		 * reduce current DMA mapping usage,
 		 * delay and try again later or