Merge commit 'v2.6.31-rc4' into next

diff --combined drivers/input/misc/cobalt_btns.c
index d01da9b,d114d3a..ee73d72
--- 1/drivers/input/misc/cobalt_btns.c
--- 2/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@@ -1,7 -1,7 +1,7 @@@
  /*
   *  Cobalt button interface driver.
   *
-  *  Copyright (C) 2007-2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+  *  Copyright (C) 2007-2008  Yoichi Yuasa <yuasa@linux-mips.org>
   *
   *  This program is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
@@@ -116,7 -116,7 +116,7 @@@ static int __devinit cobalt_buttons_pro
        }
  
        bdev->poll_dev = poll_dev;
 -      bdev->reg = ioremap(res->start, res->end - res->start + 1);
 +      bdev->reg = ioremap(res->start, resource_size(res));
        dev_set_drvdata(&pdev->dev, bdev);
  
        error = input_register_polled_device(poll_dev);
@@@ -148,7 -148,7 +148,7 @@@ static int __devexit cobalt_buttons_rem
        return 0;
  }
  
- MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");
+ MODULE_AUTHOR("Yoichi Yuasa <yuasa@linux-mips.org>");
  MODULE_DESCRIPTION("Cobalt button interface driver");
  MODULE_LICENSE("GPL");
  /* work with hotplug and coldplug */