diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-30 00:30:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-30 00:30:18 -0400 |
| commit | abdba717253382a669af9c719313ec602cc95a2d (patch) | |
| tree | 9368199c0812569f796a6e9d6c3696c2e428f0cf /drivers/auxdisplay | |
| parent | 2d408b42ed0a287c64a94b48e24c6bfa95035019 (diff) | |
| parent | 9f462a1a5de06503fd247186b91d4205ac1cf1ba (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Add linux/pagemap.h to asm/tlb.h
[SPARC64]: Need to set state to IDLE during sun4v IRQ enable.
[SPARC64]: Fix VIRQ enabling.
[SPARC64]: Add irqs to mdesc_node.
Diffstat (limited to 'drivers/auxdisplay')
0 files changed, 0 insertions, 0 deletions