Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/genalloc.c b/lib/genalloc.c
index 75ae68ce03e1..eb7c2bab9ebf 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -148,7 +148,7 @@ unsigned long gen_pool_alloc(struct gen_pool *pool, size_t size)
                         addr = chunk->start_addr +
                                             ((unsigned long)start_bit << order);
                         while (nbits--)
-                                __set_bit(start_bit++, &chunk->bits);
+                                __set_bit(start_bit++, chunk->bits);
                         spin_unlock_irqrestore(&chunk->lock, flags);
                         read_unlock(&pool->lock);
                         return addr;
@@ -187,7 +187,7 @@ void gen_pool_free(struct gen_pool *pool, unsigned long addr, size_t size)
                         spin_lock_irqsave(&chunk->lock, flags);
                         bit = (addr - chunk->start_addr) >> order;
                         while (nbits--)
-                                __clear_bit(bit++, &chunk->bits);
+                                __clear_bit(bit++, chunk->bits);
                         spin_unlock_irqrestore(&chunk->lock, flags);
                         break;
                 }