Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/message/fusion/mptlan.c drivers/net/sfc/ethtool.c net/mac80211/debugfs_sta.c
Showing
- Documentation/feature-removal-schedule.txt 0 additions, 24 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/ftrace.txt 73 additions, 98 deletionsDocumentation/ftrace.txt
- Documentation/powerpc/booting-without-of.txt 10 additions, 55 deletionsDocumentation/powerpc/booting-without-of.txt
- Documentation/video4linux/README.cx88 2 additions, 2 deletionsDocumentation/video4linux/README.cx88
- Documentation/video4linux/si470x.txt 118 additions, 0 deletionsDocumentation/video4linux/si470x.txt
- MAINTAINERS 31 additions, 0 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/Kconfig 1 addition, 1 deletionarch/Kconfig
- arch/ia64/Kconfig 10 additions, 9 deletionsarch/ia64/Kconfig
- arch/ia64/hp/common/hwsw_iommu.c 1 addition, 8 deletionsarch/ia64/hp/common/hwsw_iommu.c
- arch/ia64/include/asm/io.h 0 additions, 24 deletionsarch/ia64/include/asm/io.h
- arch/ia64/include/asm/machvec.h 1 addition, 21 deletionsarch/ia64/include/asm/machvec.h
- arch/ia64/include/asm/meminit.h 0 additions, 1 deletionarch/ia64/include/asm/meminit.h
- arch/ia64/include/asm/sal.h 14 additions, 1 deletionarch/ia64/include/asm/sal.h
- arch/ia64/include/asm/sn/sn_sal.h 45 additions, 0 deletionsarch/ia64/include/asm/sn/sn_sal.h
- arch/ia64/kernel/acpi.c 24 additions, 5 deletionsarch/ia64/kernel/acpi.c
- arch/ia64/kernel/pci-dma.c 0 additions, 2 deletionsarch/ia64/kernel/pci-dma.c
- arch/ia64/kernel/setup.c 5 additions, 4 deletionsarch/ia64/kernel/setup.c
- arch/ia64/mm/discontig.c 0 additions, 1 deletionarch/ia64/mm/discontig.c
- arch/ia64/uv/kernel/setup.c 6 additions, 0 deletionsarch/ia64/uv/kernel/setup.c
Loading
Please register or sign in to comment