Stephen Boyd
84d1c1a3a3
Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4
...
Fix NR_IPI to be 7 instead of 6 because both googly and core add
an IPI.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org >
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
include/linux/wakelock.h
kernel/power/Kconfig
kernel/power/Makefile
kernel/power/main.c
kernel/power/power.h
2013-02-25 11:25:46 -08:00
..
2013-02-20 02:49:15 -08:00
2013-02-20 01:32:27 -08:00
2011-10-17 09:11:51 +01:00
2012-03-30 21:03:54 +01:00
2011-11-17 16:58:00 +00:00
2010-07-07 16:38:36 +02:00
2010-07-07 16:38:36 +02:00
2012-03-21 01:59:40 -04:00
2011-03-23 19:47:19 -07:00
2012-03-29 18:02:10 -07:00
2011-10-31 19:30:49 -04:00
2009-12-24 18:34:08 +00:00
2011-09-13 11:12:14 +02:00
2012-03-28 18:30:01 +01:00
2012-03-29 18:02:10 -07:00
2012-02-21 17:04:10 -06:00
2011-07-22 23:09:07 +01:00
2012-04-12 15:43:40 -07:00
2012-03-28 18:30:01 +01:00
2011-05-26 10:31:06 +01:00
2013-02-20 02:49:03 -08:00
2011-05-11 15:12:32 +02:00
2012-03-28 18:30:01 +01:00
2013-02-20 01:32:07 -08:00
2013-02-20 02:48:48 -08:00
2012-03-30 11:51:46 +01:00
2012-03-24 09:38:56 +00:00
2011-10-31 19:30:49 -04:00
2013-02-20 02:48:49 -08:00
2011-08-11 10:10:26 +08:00
2012-03-24 09:38:56 +00:00
2010-10-29 13:14:40 -05:00
2011-11-30 23:54:54 +00:00
2012-03-28 18:30:01 +01:00
2011-11-30 23:54:54 +00:00
2011-11-26 21:58:53 +00:00
2011-12-13 08:52:03 +00:00
2011-11-26 21:58:53 +00:00
2011-09-20 18:17:43 +00:00
2012-04-02 08:53:24 -07:00
2011-09-20 18:17:43 +00:00
2012-04-09 13:57:52 -07:00
2013-02-20 02:50:21 -08:00
2013-02-20 01:32:10 -08:00
2011-08-23 15:30:33 +01:00
2011-12-13 08:52:02 +00:00
2013-02-20 02:49:15 -08:00
2012-03-24 09:38:55 +00:00
2013-02-20 02:44:08 -08:00
2013-02-20 02:48:48 -08:00
2013-02-20 02:44:08 -08:00
2013-02-20 02:44:08 -08:00
2013-02-20 02:44:32 -08:00
2013-02-20 02:44:32 -08:00
2013-02-20 02:44:32 -08:00
2013-02-20 02:48:48 -08:00
2011-10-31 19:30:48 -04:00
2011-11-16 10:06:42 +00:00
2013-02-25 11:25:46 -08:00
2012-05-05 13:54:01 +01:00
2011-08-28 10:39:41 +01:00
2011-10-31 19:30:49 -04:00
2012-03-24 09:38:53 +00:00
2013-02-20 01:32:05 -08:00
2012-04-23 15:44:41 +01:00
2012-03-28 18:30:01 +01:00
2011-10-25 08:19:29 +01:00
2012-03-28 17:14:35 -07:00
2012-04-19 19:35:10 +01:00
2013-02-25 11:25:46 -08:00
2011-10-31 19:30:49 -04:00
2011-12-06 14:04:14 +00:00
2013-02-20 01:32:03 -08:00
2012-05-05 13:54:01 +01:00
2011-04-29 15:53:14 +01:00
2012-03-28 18:30:01 +01:00
2012-03-28 18:30:01 +01:00
2012-02-04 10:32:18 +00:00
2011-11-30 23:55:21 +00:00
2012-04-09 13:53:07 -07:00
2011-12-15 14:02:19 -08:00
2013-02-20 02:49:06 -08:00
2011-10-31 19:30:48 -04:00