Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6: alpha: Fix printk format errors alpha: convert perf_event to use local_t Fix call to replaced SuperIO functions alpha: remove homegrown L1_CACHE_ALIGN macro
No related branches found
No related tags found
Showing
- arch/alpha/include/asm/cache.h 0 additions, 1 deletionarch/alpha/include/asm/cache.h
- arch/alpha/kernel/err_marvel.c 3 additions, 3 deletionsarch/alpha/kernel/err_marvel.c
- arch/alpha/kernel/perf_event.c 9 additions, 9 deletionsarch/alpha/kernel/perf_event.c
- arch/alpha/kernel/proto.h 0 additions, 3 deletionsarch/alpha/kernel/proto.h
- arch/alpha/kernel/sys_cabriolet.c 16 additions, 3 deletionsarch/alpha/kernel/sys_cabriolet.c
- arch/alpha/kernel/sys_takara.c 9 additions, 2 deletionsarch/alpha/kernel/sys_takara.c
Loading
Please register or sign in to comment