Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/bluetooth/l2cap_core.c
Showing
- Documentation/filesystems/nilfs2.txt 0 additions, 1 deletionDocumentation/filesystems/nilfs2.txt
- arch/arm/mach-davinci/board-dm365-evm.c 2 additions, 2 deletionsarch/arm/mach-davinci/board-dm365-evm.c
- arch/arm/mach-davinci/gpio.c 16 additions, 5 deletionsarch/arm/mach-davinci/gpio.c
- arch/arm/mach-davinci/irq.c 6 additions, 0 deletionsarch/arm/mach-davinci/irq.c
- arch/arm/mach-ixp4xx/common.c 8 additions, 2 deletionsarch/arm/mach-ixp4xx/common.c
- arch/arm/mach-s3c64xx/dma.c 7 additions, 7 deletionsarch/arm/mach-s3c64xx/dma.c
- arch/arm/plat-s3c24xx/dma.c 6 additions, 6 deletionsarch/arm/plat-s3c24xx/dma.c
- arch/arm/plat-samsung/dma.c 3 additions, 3 deletionsarch/arm/plat-samsung/dma.c
- arch/arm/plat-samsung/include/plat/dma.h 11 additions, 10 deletionsarch/arm/plat-samsung/include/plat/dma.h
- arch/arm/plat-samsung/irq-uart.c 7 additions, 0 deletionsarch/arm/plat-samsung/irq-uart.c
- arch/arm/plat-samsung/irq-vic-timer.c 7 additions, 0 deletionsarch/arm/plat-samsung/irq-vic-timer.c
- arch/mips/kernel/i8259.c 6 additions, 16 deletionsarch/mips/kernel/i8259.c
- arch/sparc/include/asm/irqflags_32.h 4 additions, 4 deletionsarch/sparc/include/asm/irqflags_32.h
- arch/sparc/include/asm/irqflags_64.h 7 additions, 7 deletionsarch/sparc/include/asm/irqflags_64.h
- arch/sparc/kernel/entry.S 1 addition, 1 deletionarch/sparc/kernel/entry.S
- arch/sparc/mm/leon_mm.c 1 addition, 1 deletionarch/sparc/mm/leon_mm.c
- drivers/acpi/apei/hest.c 11 additions, 1 deletiondrivers/acpi/apei/hest.c
- drivers/acpi/osl.c 0 additions, 17 deletionsdrivers/acpi/osl.c
- drivers/gpio/wm831x-gpio.c 1 addition, 0 deletionsdrivers/gpio/wm831x-gpio.c
- drivers/hwmon/adm1275.c 5 additions, 5 deletionsdrivers/hwmon/adm1275.c
Loading
Please register or sign in to comment