]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branch 'master' into csb1725
authorNils Faerber <nils.faerber@kernelconcepts.de>
Fri, 7 Jan 2011 10:50:01 +0000 (11:50 +0100)
committerNils Faerber <nils.faerber@kernelconcepts.de>
Fri, 7 Jan 2011 10:50:01 +0000 (11:50 +0100)
Conflicts:
arch/arm/mach-mv78xx0/mpp.c
resolved

1  2 
arch/arm/mach-mv78xx0/mpp.c
drivers/net/mv643xx_eth.c
drivers/watchdog/Kconfig

Simple merge
Simple merge
Simple merge