From: Linus Torvalds Date: Thu, 17 Mar 2011 02:01:29 +0000 (-0700) Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 X-Git-Tag: firefly_0821_release~7613^2~2193 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=242e5d06be2ad2633c85313a37862e03f4450a46;p=firefly-linux-kernel-4.4.55.git Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] tioca: Fix assignment from incompatible pointer warnings [IA64] mca.c: Fix cast from integer to pointer warning [IA64] setup.c Typo fix "Architechtuallly" [IA64] Add CONFIG_MISC_DEVICES=y to configs that need it. [IA64] disable interrupts at end of ia64_mca_cpe_int_handler() [IA64] Add DMA_ERROR_CODE define. pstore: fix build warning for unused return value from sysfs_create_file pstore: X86 platform interface using ACPI/APEI/ERST pstore: new filesystem interface to platform persistent storage --- 242e5d06be2ad2633c85313a37862e03f4450a46