]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mips/mips-for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 00:18:21 +0000 (10:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 00:18:21 +0000 (10:18 +1000)
commit54a77c279ad61eb35faa17a6699160f41c98085f
tree104eedcd6d0180520c13cb0703e36f0719baaa0e
parent5a3cafe9f6ac259e4742fb211b4462fc9881bb5b
parent97541ccfb9db2bb9cd1dde6344d5834438d14bda
Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
drivers/net/ethernet/octeon/octeon_mgmt.c
drivers/net/ethernet/octeon/octeon_mgmt.c