]> err.no Git - linux-2.6/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 6 Dec 2007 20:26:17 +0000 (12:26 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 6 Dec 2007 20:26:17 +0000 (12:26 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  [PARISC] lba_pci: pci_claim_resources disabled expansion roms
  [PARISC] print more than one character at a time for pdc console
  [PARISC] Update parisc-linux MAINTAINERS entries
  [PARISC] timer interrupt should not be IRQ_DISABLED
  Revert "[PARISC] import necessary bits of libgcc.a"

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge