Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Dec 2010 17:53:50 +0000 (09:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Dec 2010 17:53:50 +0000 (09:53 -0800)
commit9e0afb9437c68be62085d74407b169732108a929
tree5f29dc868c0844bcccd784730579c1ef05b77cc6
parent7aeb3be341cc7f1fbf2b98fbef980a816736fe8e
parent65ada547d68dc075aa06df92fe325bff07cbc606
Merge branch 'sh-fixes-for-linus' of git://git./linux/kernel/git/lethal/sh-2.6

* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  clocksource: sh_cmt: Remove nested spinlock fix