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]: Fix two year old bug in early bootup asm. [SPARC64]: Update defconfig. [SPARC64]: Fix log message type in vio_create_one(). [SPARC64]: Tweak assertions in sun4v_build_virq(). [SPARC64]: Tweak kernel log messages in power_probe(). [SPARC64]: Fix handling of multiple vdc-port nodes. [SPARC64]: Fix device type matching in VIO's devspec_show(). [SPARC64]: Fix MODULE_DEVICE_TABLE() specification in VDC and VNET. [SPARC]: Add sys_fallocate() entries. [SPARC64]: Use orderly_poweroff().
No related branches found
No related tags found
Showing
- arch/sparc/kernel/systbls.S 4 additions, 5 deletionsarch/sparc/kernel/systbls.S
- arch/sparc64/defconfig 13 additions, 11 deletionsarch/sparc64/defconfig
- arch/sparc64/kernel/ds.c 2 additions, 4 deletionsarch/sparc64/kernel/ds.c
- arch/sparc64/kernel/head.S 0 additions, 1 deletionarch/sparc64/kernel/head.S
- arch/sparc64/kernel/irq.c 2 additions, 2 deletionsarch/sparc64/kernel/irq.c
- arch/sparc64/kernel/mdesc.c 52 additions, 4 deletionsarch/sparc64/kernel/mdesc.c
- arch/sparc64/kernel/power.c 3 additions, 61 deletionsarch/sparc64/kernel/power.c
- arch/sparc64/kernel/sys_sparc32.c 9 additions, 3 deletionsarch/sparc64/kernel/sys_sparc32.c
- arch/sparc64/kernel/systbls.S 5 additions, 6 deletionsarch/sparc64/kernel/systbls.S
- arch/sparc64/kernel/vio.c 28 additions, 5 deletionsarch/sparc64/kernel/vio.c
- drivers/block/sunvdc.c 9 additions, 17 deletionsdrivers/block/sunvdc.c
- drivers/net/sunvnet.c 1 addition, 1 deletiondrivers/net/sunvnet.c
- include/asm-sparc/unistd.h 3 additions, 3 deletionsinclude/asm-sparc/unistd.h
- include/asm-sparc64/power.h 0 additions, 7 deletionsinclude/asm-sparc64/power.h
- include/asm-sparc64/unistd.h 3 additions, 3 deletionsinclude/asm-sparc64/unistd.h
- include/asm-sparc64/vio.h 2 additions, 0 deletionsinclude/asm-sparc64/vio.h
Loading
Please register or sign in to comment