Merge branch 'akpm/master'

diff --cc drivers/thermal/cpu_cooling.c
index 99a5d7551b3395c69b2cf962b6da0627ae6c6cee,99a5d7551b3395c69b2cf962b6da0627ae6c6cee..f6ce61749954493a760dfdb9e5d9c2c221d4744a
--- 1/drivers/thermal/cpu_cooling.c
--- 2/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@@ -9,7 -9,7 +9,7 @@@
   *  it under the terms of the GNU General Public License as published by
   *  the Free Software Foundation; version 2 of the License.
   *
-- *  This program is distributed in the hope that it will be useful, but
++ *  This program is distributed in the hope that it will be useful, butX_ID_MASK
   *  WITHOUT ANY WARRANTY; without even the implied warranty of
   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   *  General Public License for more details.
@@@ -86,7 -86,7 +86,7 @@@ again
        else if (unlikely(err))
                return err;
  
--      *id = *id & MAX_ID_MASK;
++      *id = *id & MAX_IDR_MASK;
        return 0;
  }