From edf4139da46a8fe242485dc3e779114284f5162d Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 29 Oct 2008 14:01:09 -0700
Subject: [PATCH] --- yaml --- r: 118041 b: refs/heads/master c:
 e99c97ade53fb6f5e665f2960eb86c624a532d7b h: refs/heads/master i:   118039:
 0e213f3c3160099e931bb1b4236cfc636bf18959 v: v3

---
 [refs]             | 2 +-
 trunk/mm/vmalloc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5a3facce1b30..805d9a81bbc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b77b0ef207624c9d9f8064ccbfd6da169780df44
+refs/heads/master: e99c97ade53fb6f5e665f2960eb86c624a532d7b
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 036536945dd9..f1cc03bbf6ac 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -897,7 +897,8 @@ EXPORT_SYMBOL(vm_unmap_ram);
  * @count: number of pages
  * @node: prefer to allocate data structures on this node
  * @prot: memory protection to use. PAGE_KERNEL for regular RAM
- * @returns: a pointer to the address that has been mapped, or NULL on failure
+ *
+ * Returns: a pointer to the address that has been mapped, or %NULL on failure
  */
 void *vm_map_ram(struct page **pages, unsigned int count, int node, pgprot_t prot)
 {