tree f4073c90ec71ebb37a0934dc14b52959ad58bfaa
parent a79960e576ebca9dbf24489b562689f2be7e9ff0
parent d0608b54740c82b08056b7611e38a3fd73be3564
author Linus Torvalds <torvalds@linux-foundation.org> 1260987127 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260987127 -0800

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