]> git.karo-electronics.de Git - mv-sheeva.git/commit
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)
commit59f40aff7930052a74ddf5c297aa1974b0838529
treee81c3d0e14c830fe220bbb0a4c56d16ee2c1e17b
parent291b7c3a02a7eafbb8ea89a2c0e93676d6972926
parent690c12d2c8ca50e55a3f507059c780ecdb8fd83f
Merge branch 'master' into csb1725

Conflicts:
arch/arm/mach-mv78xx0/mpp.c
resolved
arch/arm/mach-mv78xx0/mpp.c
drivers/net/mv643xx_eth.c
drivers/watchdog/Kconfig