From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Dec 2009 18:12:07 +0000 (-0800)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Tag: v2.6.33-rc1~67
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b2adf0cbec4cf0934c63f48f893e0cebde380d0c;p=~emulex%2Finfiniband.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: Fixup last users of irq_chip->typename
  parisc: convert /proc/pdc/{lcd,led} to seq_file
  parisc: Convert BUG() to use unreachable()
  parisc: Replace old style lock init in smp.c
  parisc: use sort() instead of home-made implementation (v2)
  parisc: add CALLER_ADDR{0-6} macros
  parisc: remove unused IRQSTAT_SIRQ_PEND and IRQSTAT_SZ defines
  parisc: remove duplicated #include
---

b2adf0cbec4cf0934c63f48f893e0cebde380d0c