Merge branch 'cn6xxx-mgmt' of git://git.linux-mips.org/pub/scm/daney/upstream-daney...
authorRalf Baechle <ralf@linux-mips.org>
Thu, 27 Sep 2012 16:00:34 +0000 (18:00 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 27 Sep 2012 16:00:34 +0000 (18:00 +0200)
commite33fd70baea1032a62b1a2a051ea4c07a1aaa402
treecebcf117b38c86c2d879ba5e36556624698f402c
parent9b11d4370c3a425e18ffccc1e93062864eca7337
parenta0ce9b1e899494b0af84f06d7e1ad9c90708e144
Merge branch 'cn6xxx-mgmt' of git://git.linux-mips.org/daney/upstream-daney into mips-for-linux-next
arch/mips/include/asm/octeon/octeon.h