tree 9d1e7838206771f830333036ebaf961894c0c6e3
parent a0863130757f32df602c1c60326530c0152b626b
parent 9821b1f4a145b20db08108362f0b4caf4f0832a1
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1204860725 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1204860725 -0800

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