]> Pileus Git - ~andy/linux/commitdiff
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)
1  2 
arch/mips/include/asm/octeon/octeon.h

Simple merge