]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
projects / ~shefty / rdma-dev.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a49f0d1 43880f7)
Merge tag 'sunxi-fixes-for-3.8-rc2' of git://github.com/mripard/linux into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 28 Dec 2012 07:53:01 +0000 (08:53 +0100)
committerOlof Johansson <olof@lixom.net>
Fri, 28 Dec 2012 07:53:01 +0000 (08:53 +0100)
From Maxime Ripard:
Fixes for the sunxi core to be merged in 3.8-rc2

* tag 'sunxi-fixes-for-3.8-rc2' of git://github.com/mripard/linux:
  sunxi: Change the machine compatible string.
  ARM: multi_v7_defconfig: Add ARCH_SUNXI


Trivial merge
RDMA kernel development