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
..
acpi	Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release	2012-01-23 19:47:06 -05:00
asm-generic	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
crypto	crypto: serpent-sse2 - add lrw support	2011-11-21 16:13:24 +08:00
drm	drm: bump DRM_CONNECTOR_MAX_ENCODER from 2 to 3	2012-01-13 09:01:09 +00:00
keys	keys: add a "logon" key type	2012-01-17 22:39:40 -06:00
linux	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-01-24 22:05:44 -08:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-18 12:53:54 -08:00
misc
mtd	mtd: document that MEMWRITE ioctl is NAND-specific	2012-01-09 18:18:36 +00:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-01-24 15:51:40 -08:00
pcmcia
rdma	rdma/core: Fix sparse warnings	2012-01-04 09:17:45 -08:00
rxrpc
scsi	[SCSI] libfc: Declare local functions static	2012-01-16 12:45:48 +04:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2012-01-12 08:00:30 -08:00
target	target: Set additional sense length field in sense data	2011-12-16 06:29:04 +00:00
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-01-17 15:49:54 -08:00
video	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
xen	Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block	2012-01-15 12:48:41 -08:00
Kbuild