Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2008-03-06 19:32:05 -08:00

parent a086313075 9821b1f4a1

commit 46fbdf8935

5 changed files with 17 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

arch/blackfin/kernel/fixed_code.S

View file

4

arch/blackfin/mach-bf548/boards/ezkit.c

View file

5

arch/blackfin/mach-common/entry.S

View file

2

include/asm-blackfin/mmu_context.h

View file

6

include/asm-blackfin/unistd.h

View file