Merge branch 'cleanup/divs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1

Browse Source

Signed-off-by: Chris Mason <clm@fb.com>

Conflicts:
	fs/btrfs/volumes.c

...

This commit is contained in:

Chris Mason

2015-03-25 12:25:02 -07:00

parent fc4c3c872f 29cf342b8f

commit 9b305632cb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available