summaryrefslogtreecommitdiff
path: root/mausezahn/.gitignore
AgeCommit message (Expand)AuthorFilesLines
2013-05-13staging: add mausezahn staging directoryDaniel Borkmann1-0/+4
ion>space:mode:
authorDavid Sterba <dsterba@suse.com>2016-05-16 15:46:29 +0200
committerDavid Sterba <dsterba@suse.com>2016-05-16 15:46:29 +0200
commit680834ca0ad4e9827048d4bda1e38db69c3dd1e4 (patch)
tree595935ba3afc91dce9be83ca65932f3cf1379436 /Makefile
parent36fac9e9ff20f71fe7ba21978f5949a38d390a4b (diff)
parent14b05c5106312744badb463e7fb9a78811e44fc0 (diff)
Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516
# Conflicts: # include/uapi/linux/btrfs.h
Diffstat (limited to 'Makefile')