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] define "_sdata" symbol pstore: Fix Kconfig dependencies for apei->pstore pstore: fix potential logic issue in pstore read interface pstore: fix pstore filesystem mount/remount issue pstore: fix one type of return value in pstore [IA64] fix build warning in arch/ia64/oprofile/backtrace.c
Showing
- arch/ia64/kernel/vmlinux.lds.S 1 addition, 0 deletionsarch/ia64/kernel/vmlinux.lds.S
- arch/ia64/oprofile/backtrace.c 1 addition, 1 deletionarch/ia64/oprofile/backtrace.c
- drivers/acpi/apei/Kconfig 1 addition, 0 deletionsdrivers/acpi/apei/Kconfig
- drivers/acpi/apei/erst.c 45 additions, 16 deletionsdrivers/acpi/apei/erst.c
- fs/pstore/platform.c 9 additions, 3 deletionsfs/pstore/platform.c
- include/linux/pstore.h 3 additions, 1 deletioninclude/linux/pstore.h
Loading
Please register or sign in to comment