]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 806c9b4 ddf6ad0)
Merge remote-tracking branch 'xfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 02:15:33 +0000 (12:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 02:15:33 +0000 (12:15 +1000)
Conflicts:
fs/xfs/xfs_log_cil.c
fs/xfs/xfs_log_recover.c

1  2 
fs/xfs/xfs_trace.h patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/xfs_trace.h
Simple merge
Linux kernel for KaRo TX COM modules