Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: [Blackfin] arch: current_l1_stack_save is a pointer, so use NULL rather than 0 [Blackfin] arch: fix atomic and32/xor32 comments and ENDPROC markings [Blackfin] arch: fix bug - allow SDH driver to be used as module [Blackfin] arch: to kill syscalls missing warning by adding new timerfd syscalls
Showing
- arch/blackfin/kernel/fixed_code.S 6 additions, 6 deletionsarch/blackfin/kernel/fixed_code.S
- arch/blackfin/mach-bf548/boards/ezkit.c 2 additions, 2 deletionsarch/blackfin/mach-bf548/boards/ezkit.c
- arch/blackfin/mach-common/entry.S 4 additions, 1 deletionarch/blackfin/mach-common/entry.S
- include/asm-blackfin/mmu_context.h 1 addition, 1 deletioninclude/asm-blackfin/mmu_context.h
- include/asm-blackfin/unistd.h 4 additions, 2 deletionsinclude/asm-blackfin/unistd.h
Loading
Please register or sign in to comment