Commit 680834c

committed

Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516

# Conflicts: # include/uapi/linux/btrfs.h

2 parents 36fac9e + 14b05c5 commit 680834cCopy full SHA for 680834c

4 files changed

+1135

-1064

lines changed

+1135

-1064

lines changed

Comments

(0)