]> git.karo-electronics.de Git - mv-sheeva.git/commit
Merge branch 'master' into tk71
authorNils Faerber <nils.faerber@kernelconcepts.de>
Fri, 6 May 2011 20:20:15 +0000 (22:20 +0200)
committerNils Faerber <nils.faerber@kernelconcepts.de>
Fri, 6 May 2011 20:20:15 +0000 (22:20 +0200)
commitf2ec334db8d14ae3ec2e4bf8d974f75b8f772e26
tree7ed3800c5229d2cac0e1f271e9e7768f739a8ee9
parent81e20d4d8d0317ecf1c7d193a52ab26cf74e1737
parent92d62d098f574ed70b26548e6a2e2f67025864dc
Merge branch 'master' into tk71

Conflicts:
arch/arm/mach-kirkwood/Makefile
arch/arm/mach-kirkwood/Kconfig
arch/arm/mach-kirkwood/Makefile
drivers/net/mv643xx_eth.c