From fc692f6a0444f54dd4c00f5194263c4d71f1dad1 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri, 29 Feb 2008 22:03:15 -0800
Subject: [PATCH] --- yaml --- r: 86663 b: refs/heads/master c:
 0643245f595dc175c14245fa1e1e9efda3e12f2a h: refs/heads/master i:   86661:
 639bc0ec2dc153eabb8208f6e9fb70bb0bcaa8ba   86659:
 846901e820d792d2194d5c78b05e316bbc5bb69e   86655:
 97324de9f155264ee287d908bbb75102ac4001c5 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/base/transport_class.c | 4 +---
 trunk/drivers/pci/rom.c              | 3 +--
 trunk/mm/truncate.c                  | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b1c1dd687601..f57e1dcc96a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0bcabcd72dda5f553322a1ca92ae31c15b408b6
+refs/heads/master: 0643245f595dc175c14245fa1e1e9efda3e12f2a
diff --git a/trunk/drivers/base/transport_class.c b/trunk/drivers/base/transport_class.c
index f25e7c6b2d27..40bca48abc12 100644
--- a/trunk/drivers/base/transport_class.c
+++ b/trunk/drivers/base/transport_class.c
@@ -126,9 +126,7 @@ static int transport_setup_classdev(struct attribute_container *cont,
 }
 
 /**
- * transport_setup_device - declare a new dev for transport class association
- *			    but don't make it visible yet.
- *
+ * transport_setup_device - declare a new dev for transport class association but don't make it visible yet.
  * @dev: the generic device representing the entity being added
  *
  * Usually, dev represents some component in the HBA system (either
diff --git a/trunk/drivers/pci/rom.c b/trunk/drivers/pci/rom.c
index a98b2470b9ea..bd5c0e031398 100644
--- a/trunk/drivers/pci/rom.c
+++ b/trunk/drivers/pci/rom.c
@@ -242,8 +242,7 @@ void pci_remove_rom(struct pci_dev *pdev)
 #endif  /*  0  */
 
 /**
- * pci_cleanup_rom - internal routine for freeing the ROM copy created
- * by pci_map_rom_copy called from remove.c
+ * pci_cleanup_rom - free the ROM copy created by pci_map_rom_copy
  * @pdev: pointer to pci device struct
  *
  * Free the copied ROM if we allocated one.
diff --git a/trunk/mm/truncate.c b/trunk/mm/truncate.c
index c35c49e54fb6..7d20ce41ecf5 100644
--- a/trunk/mm/truncate.c
+++ b/trunk/mm/truncate.c
@@ -134,8 +134,7 @@ invalidate_complete_page(struct address_space *mapping, struct page *page)
 }
 
 /**
- * truncate_inode_pages - truncate range of pages specified by start and
- * end byte offsets
+ * truncate_inode_pages - truncate range of pages specified by start & end byte offsets
  * @mapping: mapping to truncate
  * @lstart: offset from which to truncate
  * @lend: offset to which to truncate