Merge commit 'v2.6.29-rc4' into core/percpu
Conflicts: arch/x86/mach-voyager/voyager_smp.c arch/x86/mm/fault.c
Showing
- .mailmap 3 additions, 1 deletion.mailmap
- Documentation/block/queue-sysfs.txt 63 additions, 0 deletionsDocumentation/block/queue-sysfs.txt
- 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/filesystems/ubifs.txt 0 additions, 7 deletionsDocumentation/filesystems/ubifs.txt
- Documentation/powerpc/dts-bindings/fsl/mpc5200.txt 180 additions, 0 deletionsDocumentation/powerpc/dts-bindings/fsl/mpc5200.txt
- Documentation/powerpc/mpc52xx-device-tree-bindings.txt 0 additions, 277 deletionsDocumentation/powerpc/mpc52xx-device-tree-bindings.txt
- Documentation/video4linux/v4lgrab.c 17 additions, 8 deletionsDocumentation/video4linux/v4lgrab.c
- MAINTAINERS 11 additions, 2 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/include/asm/bug.h 2 additions, 2 deletionsarch/alpha/include/asm/bug.h
- arch/arm/kernel/entry-armv.S 1 addition, 0 deletionsarch/arm/kernel/entry-armv.S
- arch/arm/kernel/entry-common.S 1 addition, 1 deletionarch/arm/kernel/entry-common.S
- arch/arm/kernel/irq.c 1 addition, 1 deletionarch/arm/kernel/irq.c
- arch/arm/mach-msm/board-halibut.c 1 addition, 0 deletionsarch/arm/mach-msm/board-halibut.c
- arch/arm/mach-omap1/devices.c 1 addition, 1 deletionarch/arm/mach-omap1/devices.c
- arch/arm/mach-omap1/mcbsp.c 10 additions, 88 deletionsarch/arm/mach-omap1/mcbsp.c
- arch/arm/mach-omap2/devices.c 7 additions, 4 deletionsarch/arm/mach-omap2/devices.c
- arch/arm/mach-omap2/id.c 5 additions, 1 deletionarch/arm/mach-omap2/id.c
- arch/arm/mach-omap2/irq.c 1 addition, 0 deletionsarch/arm/mach-omap2/irq.c
Loading
Please register or sign in to comment