Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Showing
- arch/sparc/Kconfig 4 additions, 0 deletionsarch/sparc/Kconfig
- arch/sparc/kernel/sys_sunos.c 1 addition, 1 deletionarch/sparc/kernel/sys_sunos.c
- arch/sparc64/Kconfig 4 additions, 0 deletionsarch/sparc64/Kconfig
- arch/sparc64/kernel/sys_sunos32.c 1 addition, 1 deletionarch/sparc64/kernel/sys_sunos32.c
- arch/sparc64/solaris/misc.c 1 addition, 1 deletionarch/sparc64/solaris/misc.c
- drivers/char/Kconfig 2 additions, 2 deletionsdrivers/char/Kconfig
- drivers/char/keyboard.c 5 additions, 5 deletionsdrivers/char/keyboard.c
- drivers/fc4/Kconfig 4 additions, 4 deletionsdrivers/fc4/Kconfig
- drivers/input/misc/Kconfig 1 addition, 1 deletiondrivers/input/misc/Kconfig
- drivers/input/serio/i8042.h 1 addition, 1 deletiondrivers/input/serio/i8042.h
- drivers/mtd/maps/Kconfig 1 addition, 1 deletiondrivers/mtd/maps/Kconfig
- drivers/net/sungem.c 2 additions, 2 deletionsdrivers/net/sungem.c
- drivers/serial/Kconfig 5 additions, 5 deletionsdrivers/serial/Kconfig
- drivers/video/Kconfig 5 additions, 5 deletionsdrivers/video/Kconfig
- drivers/video/console/Kconfig 10 additions, 10 deletionsdrivers/video/console/Kconfig
- drivers/video/logo/Kconfig 1 addition, 1 deletiondrivers/video/logo/Kconfig
- fs/partitions/Kconfig 1 addition, 1 deletionfs/partitions/Kconfig
- sound/sparc/Kconfig 1 addition, 1 deletionsound/sparc/Kconfig
Please register or sign in to comment