Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
commitdb6c24fdf19bd7ee25c86ddd8021ec648b76d5ae
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jun 2008 19:16:07 +0000 (29 12:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 Jun 2008 19:16:07 +0000 (29 12:16 -0700)
tree566723870f0df122ed6852c02b0ab7a258c550bc
parenta4480ac4f966384f9d2db98bffec223e4eaf6150
parent8d0a60032ffd472f0f7821ff388e9f438c06077a
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: fix up section mismatch warning
  Blackfin arch: fix bug - kernel boot fails when Spinlock and rw-lock debugging enabled