]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fc4c3c8 29cf342)
Merge branch 'cleanup/divs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
authorChris Mason <clm@fb.com>
Wed, 25 Mar 2015 19:25:02 +0000 (12:25 -0700)
committerChris Mason <clm@fb.com>
Wed, 25 Mar 2015 19:25:02 +0000 (12:25 -0700)
commit9b305632cb220ffa495cbbefb313f3c34d4decc4
tree0d49c3e4d8f64a4cc0d3f42f37430fc60007e28btree | snapshot
parentfc4c3c872f44bf425963feba57eb9c3f8ac2d7ebcommit | diff
parent29cf342b8f1056486557015aba4538804a872dc1commit | diff
Merge branch 'cleanup/divs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1

Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/volumes.c
Linux kernel for KaRo TX COM modules