Linus Torvalds f8275f9694
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux ...
Quoth Len:
"This fixes a merge-window regression due to a conflict
between error injection and preparation to remove atomicio.c
Here we fix that regression and complete the removal
of atomicio.c.
This also re-orders some idle initialization code to
complete the merge window series that allows cpuidle
to cope with bringing processors on-line after boot."
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
Use acpi_os_map_memory() instead of ioremap() in einj driver
ACPI, APEI, EINJ, cleanup 0 vs NULL confusion
ACPI, APEI, EINJ Allow empty Trigger Error Action Table
thermal: Rename generate_netlink_event
ACPI / PM: Add Sony Vaio VPCCW29FX to nonvs blacklist.
ACPI: Remove ./drivers/acpi/atomicio.[ch]
ACPI, APEI: Add RAM mapping support to ACPI
ACPI, APEI: Add 64-bit read/write support for APEI on i386
ACPI processor hotplug: Delay acpi_processor_start() call for hotplugged cores
ACPI processor hotplug: Split up acpi_processor_add
2012-01-24 22:05:44 -08:00
2012-01-17 18:40:24 -08:00
2012-01-17 09:54:08 -05:00
2011-12-01 13:09:31 -05:00
2011-11-11 09:50:19 -08:00
2012-01-04 17:30:20 -02:00
2012-01-09 00:37:40 +01:00
2011-12-30 15:25:52 -08:00
2012-01-13 09:32:20 +10:30
2012-01-13 20:43:32 -08:00
2012-01-22 15:08:43 -05:00
2012-01-14 12:32:16 -08:00
2012-01-17 18:40:24 -08:00
2012-01-16 14:01:23 +01:00
2011-12-27 20:31:38 +01:00
2012-01-03 09:10:09 +01:00
2012-01-09 14:21:03 -08:00
2012-01-06 05:22:21 +04:00
2011-12-23 10:17:51 +11:00
2012-01-03 20:20:01 +00:00
2011-11-17 12:15:39 -08:00
2011-12-13 15:30:49 -05:00
2012-01-14 12:26:41 -08:00
2012-01-04 15:52:42 -08:00
2011-10-31 19:32:32 -04:00
2011-12-13 15:07:49 +00:00
2012-01-17 04:35:20 -05:00
2012-01-18 15:51:48 -08:00
2012-01-08 19:14:59 -05:00
2011-11-02 16:07:03 -07:00
2011-12-15 11:15:39 +01:00
2011-12-13 18:46:56 -05:00
2011-11-26 16:40:30 -05:00
2011-10-26 15:43:26 -04:00
2011-10-26 15:43:25 -04:00
2012-01-17 16:17:03 -05:00
2011-10-31 00:33:36 +08:00
2011-09-14 18:09:38 -07:00
2012-01-13 08:15:33 +01:00
2011-12-06 08:33:54 +01:00
2011-10-24 16:11:30 +02:00
2012-01-15 12:24:45 -08:00
2011-10-31 17:30:54 -07:00
2011-10-17 19:22:46 -04:00
2012-01-14 18:36:33 -08:00
2011-11-22 15:22:23 -05:00
2012-01-09 12:59:24 -08:00
2011-12-28 21:25:35 +08:00
2011-10-13 14:36:58 +01:00
2011-10-03 09:34:16 +02:00
2011-12-19 11:41:40 +01:00
2011-09-28 13:41:50 -04:00
2011-10-31 17:30:49 -07:00
2012-01-03 22:55:19 -05:00
2012-01-10 16:30:42 -08:00
2011-12-21 07:14:34 -05:00
2012-01-10 16:30:42 -08:00
2012-01-03 22:54:57 -05:00
2012-01-13 09:32:20 +10:30
2011-10-29 21:20:22 +02:00
2011-09-23 12:05:29 +05:30
2012-01-07 12:03:30 -08:00
2012-01-18 15:51:48 -08:00
2012-01-12 20:13:11 -08:00
2012-01-05 18:52:59 -05:00
2011-11-06 19:44:47 -08:00
2011-10-21 14:24:07 +02:00
2011-12-13 09:26:45 +00:00
2012-01-13 10:29:21 -08:00
2012-01-08 12:19:57 -08:00
2011-11-23 18:49:22 +01:00
2011-11-07 23:54:53 +01:00
2011-10-31 19:32:26 -04:00
2011-10-31 20:19:04 +00:00
2012-01-23 08:44:53 -08:00
2012-01-18 10:46:21 +11:00
2012-01-04 08:56:31 -06:00
2011-10-31 20:19:04 +00:00
2011-10-31 20:18:58 +00:00
2011-10-31 20:21:24 +00:00
2011-12-16 08:49:57 -08:00
2012-01-06 10:20:21 +00:00
2011-11-06 17:12:03 -08:00
2011-12-23 21:33:15 +05:30
2011-10-31 17:30:44 -07:00
2011-09-15 14:02:57 +02:00
2011-10-04 13:08:18 -07:00
2011-10-27 20:53:43 +05:30
2011-10-31 17:30:54 -07:00
2011-11-29 12:46:19 -05:00
2011-12-14 15:21:07 -08:00
2011-11-26 14:59:39 -05:00
2011-12-09 17:35:51 -08:00
2011-12-14 00:33:42 +01:00
2011-10-06 19:47:19 -04:00
2011-12-12 13:54:36 +00:00
2011-12-11 18:25:16 -05:00
2012-01-04 14:10:28 -05:00
2012-01-12 20:13:04 -08:00
2011-10-31 09:20:11 -04:00
2011-10-10 18:25:59 +02:00
2012-01-03 22:54:58 -05:00
2011-12-19 20:07:13 +00:00
2011-10-19 19:35:51 -04:00
2011-10-31 19:32:32 -04:00
2011-12-27 01:06:33 +01:00
2012-01-23 17:17:45 -08:00
2011-10-31 17:30:54 -07:00
2011-10-05 01:10:12 +00:00
2011-12-05 13:28:45 -05:00
2012-01-07 17:26:49 -05:00
2011-12-13 11:58:49 +01:00
2011-11-06 19:44:47 -08:00
2011-12-03 09:35:08 -08:00
2012-01-03 22:54:55 -05:00
2012-01-10 16:30:43 -08:00
2012-01-11 09:23:05 +00:00
2011-11-15 19:08:27 +08:00
2011-10-24 16:04:06 +02:00
2011-12-11 10:31:24 -08:00
2012-01-09 11:24:59 +01:00
2012-01-12 20:13:08 -08:00
2011-11-19 06:15:59 -05:00
2011-11-08 09:28:27 +02:00
2012-01-04 16:13:05 -08:00
2011-10-29 09:37:09 +01:00
2012-01-06 11:42:52 -08:00
2012-01-03 22:54:56 -05:00
2011-12-13 15:30:40 -05:00
2011-12-05 18:27:56 -05:00
2011-10-16 13:15:38 -07:00
2011-10-21 02:53:07 -04:00
2011-10-03 14:03:48 -04:00
2012-01-24 15:51:00 -05:00
2011-12-08 19:52:42 -05:00
2011-11-13 16:10:10 -05:00
2012-01-11 12:56:06 -08:00
2012-01-09 12:59:24 -08:00
2012-01-13 09:32:18 +10:30
2011-10-28 14:25:01 -07:00
2011-09-14 15:24:52 -04:00
2011-10-26 16:17:32 +02:00
2011-10-17 11:42:49 +02:00
2011-10-28 05:54:23 -07:00
2011-12-14 00:33:42 +01:00
2012-01-09 13:06:28 +01:00
2011-09-20 14:50:00 -04:00
2012-01-03 22:55:17 -05:00
2011-10-31 19:32:32 -04:00
2011-10-31 19:32:32 -04:00
2011-12-11 18:25:16 -05:00
2011-10-04 12:43:49 +02:00
2011-10-31 19:32:35 -04:00
2011-10-31 19:32:35 -04:00
2011-12-23 22:33:58 +00:00
2012-01-03 22:54:55 -05:00
2011-12-13 09:26:45 +00:00
2011-09-27 18:08:04 +02:00
2011-12-28 17:46:46 -05:00
2011-10-27 04:38:18 -04:00
2012-01-09 13:52:09 +01:00
2011-09-21 10:28:51 +02:00
2011-12-06 20:41:03 +01:00
2011-10-31 17:30:54 -07:00
2011-12-30 16:42:19 -05:00
2011-10-31 17:30:54 -07:00
2011-12-06 09:06:38 +01:00
2012-01-12 20:13:03 -08:00
2012-01-23 08:38:48 -08:00
2011-11-17 09:35:32 +11:00
2012-01-19 16:17:35 +11:00
2011-12-02 16:12:42 +00:00
2011-12-09 23:36:36 +01:00
2012-01-12 20:13:11 -08:00
2011-12-21 15:13:54 -08:00
2012-01-17 15:40:51 -08:00
2011-11-21 12:32:23 -08:00
2011-12-27 11:24:29 +02:00
2011-12-27 11:26:41 +02:00
2011-12-26 13:27:44 +02:00
2011-09-16 19:20:20 -04:00
2011-11-17 12:20:19 +01:00
2012-01-10 16:30:49 -08:00
2011-12-22 02:02:20 -05:00
2011-10-31 17:30:54 -07:00
2012-01-12 20:13:03 -08:00
2011-10-31 17:30:52 -07:00
2011-10-31 17:30:57 -07:00
2011-11-14 13:35:16 +01:00
2011-12-12 22:06:55 -08:00
2011-11-04 17:22:14 -07:00
2012-01-04 16:25:45 +04:00
2011-11-02 16:06:59 -07:00
2011-12-13 18:46:55 -05:00
2011-11-15 16:56:17 -05:00
2011-11-15 16:56:17 -05:00
2011-12-08 10:22:09 -08:00
2012-01-12 20:13:07 -08:00
2011-12-21 14:48:43 -08:00
2012-01-10 16:30:45 -08:00
2012-01-23 08:38:47 -08:00
2012-01-23 08:38:47 -08:00
2011-11-21 15:27:19 -05:00
2012-01-13 10:12:23 -08:00
2012-01-12 20:13:10 -08:00
2012-01-12 20:13:03 -08:00
2012-01-11 19:12:10 -08:00
2011-10-31 17:30:54 -07:00
2012-01-12 20:13:10 -08:00
2012-01-03 22:57:13 -05:00
2012-01-13 20:43:32 -08:00
2012-01-13 09:32:14 +10:30
2012-01-13 09:32:28 +10:30
2012-01-03 22:57:12 -05:00
2011-11-09 11:45:26 +02:00
2011-12-13 15:07:49 +00:00
2012-01-06 12:10:25 -08:00
2011-11-02 12:53:42 +01:00
2011-11-14 00:47:54 -05:00
2011-10-19 17:00:35 -04:00
2011-11-16 17:43:12 -05:00
2012-01-09 14:46:52 -08:00
2011-11-21 16:38:08 -05:00
2011-12-06 13:57:36 -05:00
2012-01-04 14:30:43 -05:00
2011-10-19 11:52:12 -04:00
2012-01-05 11:59:18 -05:00
2012-01-03 22:52:34 -05:00
2012-01-07 13:22:46 -05:00
2011-10-19 13:58:38 -07:00
2012-01-07 13:22:46 -05:00
2011-12-19 14:34:13 -05:00
2011-11-18 10:51:01 -08:00
2011-12-21 14:48:43 -08:00
2011-11-04 16:24:23 -04:00
2011-12-27 10:57:13 -06:00
2011-12-12 13:40:16 -07:00
2011-10-31 14:03:22 +01:00
2011-10-31 19:32:27 -04:00
2012-01-07 12:18:52 -08:00
2012-01-12 20:13:06 -08:00
2011-12-03 09:35:17 -08:00
2011-11-04 22:28:13 +01:00
2012-01-12 20:13:07 -08:00
2012-01-10 16:30:42 -08:00
2012-01-12 20:13:10 -08:00
2011-12-13 15:07:49 +00:00
2011-10-31 19:32:32 -04:00
2012-01-06 12:11:40 -08:00
2012-01-11 18:50:26 -08:00
2012-01-06 12:10:26 -08:00
2011-10-31 10:23:57 -07:00
2012-01-06 12:15:21 -08:00
2011-12-22 10:40:20 -08:00
2011-12-21 10:26:37 +01:00
2011-11-18 14:37:40 -05:00
2012-01-12 15:23:04 -08:00
2012-01-10 16:30:54 -08:00
2012-01-12 20:05:28 -08:00
2012-01-08 13:10:57 -08:00
2011-12-09 23:22:41 +01:00
2011-12-25 23:43:11 +01:00
2011-12-01 21:46:42 +01:00
2011-12-25 23:43:05 +01:00
2011-12-13 09:26:45 +00:00
2011-12-08 10:22:07 -08:00
2012-01-04 09:09:35 +04:00
2011-11-02 16:07:02 -07:00
2012-01-12 20:13:13 -08:00
2011-10-31 17:30:54 -07:00
2012-01-10 16:30:54 -08:00
2011-11-17 13:13:29 -08:00
2011-09-29 00:32:03 -04:00
2012-01-17 16:41:31 -08:00
2012-01-12 13:09:09 +01:00
2011-10-31 17:30:54 -07:00
2012-01-12 20:13:12 -08:00
2012-01-03 22:55:07 -05:00
2011-10-28 05:29:07 -07:00
2011-12-11 10:32:06 -08:00
2011-09-28 21:38:20 -07:00
2011-09-28 21:36:42 -07:00
2011-12-13 00:12:48 +08:00
2012-01-06 23:20:13 -05:00
2012-01-06 23:20:13 -05:00
2012-01-03 22:54:56 -05:00
2012-01-22 15:08:46 -05:00
2011-10-03 15:19:19 -04:00
2011-11-02 16:07:01 -07:00
2012-01-12 20:13:06 -08:00
2012-01-06 06:13:35 +04:00
2012-01-23 08:44:54 -08:00
2012-01-14 18:36:33 -08:00
2011-11-02 16:07:01 -07:00
2012-01-03 22:52:40 -05:00
2011-12-09 19:14:13 -08:00
2012-01-14 13:05:21 -08:00
2011-09-22 15:50:38 -07:00
2011-12-02 20:09:48 +09:00
2011-11-15 12:13:44 -08:00
2011-10-31 19:32:32 -04:00
2011-12-09 18:01:05 +09:00
2012-01-06 11:40:11 +05:30
2011-09-28 13:41:51 -04:00
2011-12-25 23:39:11 +01:00
2012-01-09 09:33:57 +09:00
2012-01-23 08:38:48 -08:00
2011-12-09 07:50:27 -08:00
2012-01-10 16:30:54 -08:00
2011-11-18 12:25:22 +05:30
2012-01-05 14:01:21 -05:00
2012-01-09 14:19:33 -08:00
2011-09-27 23:03:30 +03:00
2012-01-03 20:23:18 -05:00
2012-01-22 15:08:44 -05:00
2011-12-30 16:42:19 -05:00
2011-12-13 09:26:45 +00:00
2011-12-13 15:07:49 +00:00
2011-12-11 10:32:06 -08:00
2011-10-31 19:32:28 -04:00
2011-10-31 17:30:47 -07:00
2012-01-19 23:25:33 +01:00
2012-01-23 08:38:48 -08:00
2011-12-06 10:38:03 +00:00
2012-01-03 22:55:19 -05:00
2012-01-03 22:55:12 -05:00
2011-10-31 19:32:24 -04:00
2012-01-03 22:54:56 -05:00
2011-12-21 01:03:23 -05:00
2011-10-31 19:32:32 -04:00
2012-01-23 03:15:25 -05:00
2011-12-11 10:31:57 -08:00
2011-09-20 15:53:21 +10:00
2011-09-19 11:35:58 -04:00
2011-10-31 17:30:54 -07:00
2012-01-17 10:30:38 -08:00
2011-10-26 15:11:09 +02:00
2012-01-08 13:21:22 -08:00
2012-01-04 22:19:55 -08:00
2011-10-12 21:13:11 -07:00
2011-10-31 19:32:32 -04:00
2011-12-30 16:46:02 -05:00
2012-01-23 08:44:54 -08:00
2011-11-02 16:07:02 -07:00
2011-10-31 19:32:31 -04:00
2011-10-31 19:32:23 -04:00
2012-01-15 12:49:56 -08:00
2011-12-02 13:49:21 -05:00
2011-11-24 13:04:47 +10:30
2012-01-12 15:44:42 +10:30
2012-01-12 15:44:44 +10:30
2011-10-31 19:32:32 -04:00
2011-12-05 23:27:59 +00:00
2011-12-21 10:07:39 +01:00
2011-12-02 14:57:31 +01:00
2012-01-06 15:22:04 +01:00
2011-10-11 16:01:09 +03:00
2012-01-10 16:30:54 -08:00
2012-01-10 16:59:59 -08:00
2011-11-11 16:55:54 +00:00
f8275f9694