Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit - drivers/char/Kconfig

projects / firefly-linux-kernel-4.4.55.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: da2f0f7 e33e17e)

author	Chris Mason <clm@fb.com>
	Sun, 9 Aug 2015 14:35:33 +0000 (07:35 -0700)
committer	Chris Mason <clm@fb.com>
	Sun, 9 Aug 2015 14:35:33 +0000 (07:35 -0700)
commit	46cd28555ffaa40162290dba203daad0ff6f7abd
tree	a10fd81b6c7ff5ea7642b1e2462e529971e8713a	tree \| snapshot
parent	da2f0f74cf7d074e5a8918c8efdf6aba4a989b4a	commit \| diff
parent	e33e17ee1098d8d751552ac11c111e1c1a3db014	commit \| diff

Merge branch 'jeffm-discard-4.3' into for-linus-4.3

fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/super.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.h	diff1 \|	diff2 \|	blob \| history

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