Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bonding/bond_main.c drivers/net/via-velocity.c drivers/net/wireless/iwlwifi/iwl-agn.c
Showing
- Documentation/ABI/testing/sysfs-bus-usb 1 addition, 1 deletionDocumentation/ABI/testing/sysfs-bus-usb
- Documentation/filesystems/ceph.txt 139 additions, 0 deletionsDocumentation/filesystems/ceph.txt
- Documentation/ioctl/ioctl-number.txt 1 addition, 0 deletionsDocumentation/ioctl/ioctl-number.txt
- Documentation/kobject.txt 40 additions, 20 deletionsDocumentation/kobject.txt
- Documentation/networking/stmmac.txt 143 additions, 0 deletionsDocumentation/networking/stmmac.txt
- MAINTAINERS 25 additions, 1 deletionMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/include/asm/core_marvel.h 0 additions, 1 deletionarch/alpha/include/asm/core_marvel.h
- arch/alpha/include/asm/core_mcpcia.h 0 additions, 1 deletionarch/alpha/include/asm/core_mcpcia.h
- arch/alpha/include/asm/core_titan.h 0 additions, 1 deletionarch/alpha/include/asm/core_titan.h
- arch/alpha/include/asm/core_tsunami.h 0 additions, 1 deletionarch/alpha/include/asm/core_tsunami.h
- arch/alpha/kernel/sys_dp264.c 1 addition, 1 deletionarch/alpha/kernel/sys_dp264.c
- arch/alpha/kernel/sys_titan.c 1 addition, 1 deletionarch/alpha/kernel/sys_titan.c
- arch/alpha/kernel/traps.c 3 additions, 7 deletionsarch/alpha/kernel/traps.c
- arch/arm/Kconfig 45 additions, 36 deletionsarch/arm/Kconfig
- arch/arm/boot/compressed/decompress.c 1 addition, 0 deletionsarch/arm/boot/compressed/decompress.c
- arch/arm/boot/compressed/head.S 1 addition, 1 deletionarch/arm/boot/compressed/head.S
- arch/arm/boot/compressed/misc.c 1 addition, 0 deletionsarch/arm/boot/compressed/misc.c
- arch/arm/configs/cm_t35_defconfig 1 addition, 1 deletionarch/arm/configs/cm_t35_defconfig
- arch/arm/configs/n770_defconfig 1 addition, 0 deletionsarch/arm/configs/n770_defconfig
Loading
Please register or sign in to comment