]> err.no Git - linux-2.6/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jun 2008 19:16:07 +0000 (12:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jun 2008 19:16:07 +0000 (12:16 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: fix up section mismatch warning
  Blackfin arch: fix bug - kernel boot fails when Spinlock and rw-lock debugging enabled


Trivial merge