]> 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: 85b43e2 ad21be5)
Merge branch topic/uek-4.1/stable-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Thu, 23 Jun 2016 15:52:06 +0000 (08:52 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 23 Jun 2016 15:52:06 +0000 (08:52 -0700)
1  2 
fs/btrfs/inode.c patch | diff1 | diff2 | blob | history
include/linux/skbuff.h patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/inode.c
Simple merge
diff --cc include/linux/skbuff.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.