Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl3945-base.c
No related branches found
No related tags found
Showing
- .mailmap 3 additions, 1 deletion.mailmap
- Documentation/connector/cn_test.c 2 additions, 4 deletionsDocumentation/connector/cn_test.c
- Documentation/cpu-freq/user-guide.txt 0 additions, 16 deletionsDocumentation/cpu-freq/user-guide.txt
- Documentation/filesystems/sysfs-pci.txt 12 additions, 1 deletionDocumentation/filesystems/sysfs-pci.txt
- Documentation/kernel-doc-nano-HOWTO.txt 4 additions, 3 deletionsDocumentation/kernel-doc-nano-HOWTO.txt
- Documentation/kernel-parameters.txt 2 additions, 0 deletionsDocumentation/kernel-parameters.txt
- MAINTAINERS 20 additions, 3 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/include/asm/bug.h 2 additions, 2 deletionsarch/alpha/include/asm/bug.h
- arch/arm/kernel/machine_kexec.c 2 additions, 2 deletionsarch/arm/kernel/machine_kexec.c
- arch/arm/mach-pxa/dma.c 10 additions, 8 deletionsarch/arm/mach-pxa/dma.c
- arch/arm/mach-pxa/include/mach/regs-ac97.h 2 additions, 0 deletionsarch/arm/mach-pxa/include/mach/regs-ac97.h
- arch/arm/mach-pxa/include/mach/regs-ssp.h 3 additions, 0 deletionsarch/arm/mach-pxa/include/mach/regs-ssp.h
- arch/arm/mach-pxa/pxa300.c 2 additions, 2 deletionsarch/arm/mach-pxa/pxa300.c
- arch/arm/mach-pxa/pxa320.c 1 addition, 1 deletionarch/arm/mach-pxa/pxa320.c
- arch/frv/mm/dma-alloc.c 1 addition, 1 deletionarch/frv/mm/dma-alloc.c
- arch/ia64/sn/kernel/io_acpi_init.c 1 addition, 1 deletionarch/ia64/sn/kernel/io_acpi_init.c
- arch/ia64/sn/kernel/io_init.c 1 addition, 1 deletionarch/ia64/sn/kernel/io_init.c
- arch/mips/include/asm/spinlock.h 1 addition, 0 deletionsarch/mips/include/asm/spinlock.h
- arch/powerpc/boot/dts/mpc8313erdb.dts 4 additions, 7 deletionsarch/powerpc/boot/dts/mpc8313erdb.dts
Loading
Please register or sign in to comment