]> 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: 5c6a66a 6cfd4b4)
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:13:08 +0000 (11:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:13:08 +0000 (11:13 +1000)
Conflicts:
fs/ecryptfs/ecryptfs_kernel.h


Trivial merge
Linux kernel for KaRo TX COM modules