Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
commit46fbdf8935544dcde440bd807b50e52ed2ca7f3b
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Mar 2008 03:32:05 +0000 (6 19:32 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Mar 2008 03:32:05 +0000 (6 19:32 -0800)
tree9d1e7838206771f830333036ebaf961894c0c6e3
parenta0863130757f32df602c1c60326530c0152b626b
parent9821b1f4a145b20db08108362f0b4caf4f0832a1
Merge branch 'for-linus' of git://git./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