Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Showing
- Documentation/ABI/testing/ima_policy 6 additions, 6 deletionsDocumentation/ABI/testing/ima_policy
- Documentation/cpu-freq/governors.txt 2 additions, 2 deletionsDocumentation/cpu-freq/governors.txt
- Documentation/fault-injection/fault-injection.txt 2 additions, 2 deletionsDocumentation/fault-injection/fault-injection.txt
- Documentation/input/multi-touch-protocol.txt 40 additions, 8 deletionsDocumentation/input/multi-touch-protocol.txt
- Documentation/trace/ftrace-design.txt 23 additions, 3 deletionsDocumentation/trace/ftrace-design.txt
- Documentation/trace/ftrace.txt 1 addition, 1 deletionDocumentation/trace/ftrace.txt
- MAINTAINERS 4 additions, 2 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/Kconfig 1 addition, 0 deletionsarch/arm/Kconfig
- arch/arm/Makefile 1 addition, 1 deletionarch/arm/Makefile
- arch/arm/mach-kirkwood/rd88f6192-nas-setup.c 6 additions, 0 deletionsarch/arm/mach-kirkwood/rd88f6192-nas-setup.c
- arch/arm/mach-mx25/clock.c 37 additions, 21 deletionsarch/arm/mach-mx25/clock.c
- arch/arm/mach-mx25/mx25pdk.c 1 addition, 1 deletionarch/arm/mach-mx25/mx25pdk.c
- arch/arm/mach-mx3/mx31ads.c 4 additions, 0 deletionsarch/arm/mach-mx3/mx31ads.c
- arch/arm/mach-omap1/clock.c 3 additions, 3 deletionsarch/arm/mach-omap1/clock.c
- arch/arm/mach-omap2/clock34xx_data.c 0 additions, 4 deletionsarch/arm/mach-omap2/clock34xx_data.c
- arch/arm/mach-omap2/clock44xx_data.c 31 additions, 31 deletionsarch/arm/mach-omap2/clock44xx_data.c
- arch/arm/mach-omap2/cpuidle34xx.c 1 addition, 1 deletionarch/arm/mach-omap2/cpuidle34xx.c
- arch/arm/mach-omap2/gpmc.c 6 additions, 1 deletionarch/arm/mach-omap2/gpmc.c
- arch/arm/mach-omap2/id.c 23 additions, 18 deletionsarch/arm/mach-omap2/id.c
Loading
Please register or sign in to comment