]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 17 Sep 2015 21:17:58 +0000 (14:17 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 17 Sep 2015 21:17:58 +0000 (14:17 -0700)
* 'uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek:
  rtnetlink: RTEXT_FILTER_SKIP_STATS support to avoid dumping inet/inet6 stats


Trivial merge