Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index 661d374aeb2d..f8d41cb1cbe0 100644
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -66,8 +66,8 @@ struct gen_pool_chunk {
         struct list_head next_chunk;    /* next chunk in pool */
         atomic_t avail;
         phys_addr_t phys_addr;          /* physical starting address of memory chunk */
-        unsigned long start_addr;       /* starting address of memory chunk */
-        unsigned long end_addr;         /* ending address of memory chunk */
+        unsigned long start_addr;       /* start address of memory chunk */
+        unsigned long end_addr;         /* end address of memory chunk (inclusive) */
         unsigned long bits[0];          /* bitmap for allocating memory chunk */
 };