]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd7ced9 c3b46c7)
Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 18 Apr 2016 09:18:55 +0000 (11:18 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 18 Apr 2016 09:18:55 +0000 (11:18 +0200)
Sync with Linus' tree so that patches against newer codebase can be applied.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1  2 
fs/jbd2/recovery.c patch | diff1 | diff2 | blob | history
fs/jbd2/transaction.c patch | diff1 | diff2 | blob | history
fs/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/jbd2/recovery.c
Simple merge
diff --cc fs/jbd2/transaction.c
Simple merge
diff --cc fs/super.c
Simple merge
Linux kernel for KaRo TX COM modules