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] Fix CONFIG_IA64_SGI_UV build error [IA64] Update check_sal_cache_flush to use platform_send_ipi() [IA64] perfmon: fix async exit bug
Showing
- arch/ia64/Makefile 1 addition, 0 deletionsarch/ia64/Makefile
- arch/ia64/kernel/perfmon.c 5 additions, 5 deletionsarch/ia64/kernel/perfmon.c
- arch/ia64/kernel/sal.c 3 additions, 4 deletionsarch/ia64/kernel/sal.c
- arch/ia64/uv/kernel/setup.c 12 additions, 0 deletionsarch/ia64/uv/kernel/setup.c
- include/asm-ia64/sn/simulator.h 6 additions, 1 deletioninclude/asm-ia64/sn/simulator.h
Loading
Please register or sign in to comment