]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Wed, 12 Aug 2015 18:52:46 +0000 (11:52 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Wed, 12 Aug 2015 18:52:46 +0000 (11:52 -0700)
* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek:
  net/mlx4_core: need to call close fw if alloc icm is called twice


Trivial merge