]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitb8f579f6b91198c0da23df508be9b6cfa50ba46c
treec922076a21bfad497f86b43aa4fbd65fc9fb8a4d
parent806c9b45cf4d12b06d41021f31c5583a23a80e7b
parentddf6ad01434e72bfc8423e1619abdaa0af9394a8
Merge remote-tracking branch 'xfs/for-next'

Conflicts:
fs/xfs/xfs_log_cil.c
fs/xfs/xfs_log_recover.c
fs/xfs/xfs_trace.h