Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Nov 2009 15:38:19 +0000 (07:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Nov 2009 15:38:19 +0000 (07:38 -0800)
commit5cbb0601bfddfc55d6ea409651313c13e3d6e90a
treebf1216e41d30f1c2d8eea631945ef8efeb74ad56
parent2d5bc23b32e0ec6fe9c1cdd9f371063881dc1ffc
parent648f15345add88a7eea724365fe1217a8d8a1e16
Merge branch 'sh/for-2.6.32' of git://git./linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fixup last users of irq_chip->typename
  uio: pm_runtime_disable is needed if failed