]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d08fd0a 0d3c4f1)
Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 20 Nov 2015 02:02:55 +0000 (18:02 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 20 Nov 2015 02:02:55 +0000 (18:02 -0800)
* 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek:
  mm-hugetlbfs-fix-bugs-in-fallocate-hole-punch-of-areas-with-holes-v3
  mm/hugetlbfs: fix bugs in fallocate hole punch of areas with holes
  btrfs: Print Warning only if ENOSPC_DEBUG is enabled
  rtnetlink: RTEXT_FILTER_SKIP_STATS support to avoid dumping inet/inet6 stats


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.