Merge branch 'release' of git://git.kernel.org/pub/scm/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
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/pstore 35 additions, 0 deletionsDocumentation/ABI/testing/pstore
- Documentation/ABI/testing/sysfs-fs-pstore 7 additions, 0 deletionsDocumentation/ABI/testing/sysfs-fs-pstore
- arch/ia64/configs/generic_defconfig 1 addition, 0 deletionsarch/ia64/configs/generic_defconfig
- arch/ia64/configs/gensparse_defconfig 1 addition, 0 deletionsarch/ia64/configs/gensparse_defconfig
- arch/ia64/include/asm/dma-mapping.h 2 additions, 0 deletionsarch/ia64/include/asm/dma-mapping.h
- arch/ia64/kernel/mca.c 4 additions, 1 deletionarch/ia64/kernel/mca.c
- arch/ia64/sn/kernel/setup.c 1 addition, 1 deletionarch/ia64/sn/kernel/setup.c
- arch/ia64/sn/pci/tioca_provider.c 1 addition, 1 deletionarch/ia64/sn/pci/tioca_provider.c
- drivers/acpi/apei/Kconfig 1 addition, 0 deletionsdrivers/acpi/apei/Kconfig
- drivers/acpi/apei/erst.c 136 additions, 0 deletionsdrivers/acpi/apei/erst.c
- fs/Kconfig 1 addition, 0 deletionsfs/Kconfig
- fs/Makefile 1 addition, 0 deletionsfs/Makefile
- fs/pstore/Kconfig 13 additions, 0 deletionsfs/pstore/Kconfig
- fs/pstore/Makefile 7 additions, 0 deletionsfs/pstore/Makefile
- fs/pstore/inode.c 285 additions, 0 deletionsfs/pstore/inode.c
- fs/pstore/internal.h 7 additions, 0 deletionsfs/pstore/internal.h
- fs/pstore/platform.c 202 additions, 0 deletionsfs/pstore/platform.c
- include/linux/magic.h 1 addition, 0 deletionsinclude/linux/magic.h
- include/linux/pstore.h 60 additions, 0 deletionsinclude/linux/pstore.h
Loading
Please register or sign in to comment