tree b573020e4d30ecdf69b22fcd1ced3dbb0e024ed3
parent fdba0f2da4b1db682b829b76302b2f25c376051c
parent 784020fb950741cbb7390c6b622321da626fb1e8
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171222665 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171222665 -0800

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Update defconfig.
  [SPARC64]: Add PCI MSI support on Niagara.
  [SPARC64] IRQ: Use irq_desc->chip_data instead of irq_desc->handler_data
  [SPARC64]: Add obppath sysfs attribute for SBUS and PCI devices.
  [PARTITION]: Add whole_disk attribute.