diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-09 16:33:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-09 16:33:01 -0700 |
| commit | 7f45e5cd1718ed769295033ca214032848a0097d (patch) | |
| tree | bc4d2d43ea939c6c6b3782bf7d77537446eea225 /drivers/isdn/hisax/niccy.c | |
| parent | 6aecceccf5aa626b0af203e54ca62cbf308c53d8 (diff) | |
| parent | 10f0d07c51516bd24b040016c6d4304eef05f115 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc32, leon: bugfix in LEON SMP interrupt init
sparc32, sun4m: bugfix in SMP IPI traphandler
sparc: Remove unnecessary semicolons
Add support for allocating irqs for bootbus devices
Do not skip interrupt sources in sun4d interrupt handler and acknowledge interrupts correctly
Restructure sun4d_build_device_irq so that timer interrupts can be allocated
sparc: PCIC_PCI needs SPARC32 dependency
sparc: Do not select GENERIC_HARDIRQS_NO_DEPRECATED
sparc32,leon: add GRPCI2 PCI Host driver
sparc32,leon: added LEON-common low-level PCI routines
sparc32: added CONFIG_PCIC_PCI Kconfig setting
Diffstat (limited to 'drivers/isdn/hisax/niccy.c')
0 files changed, 0 insertions, 0 deletions