]> 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: b3fe21b 0124538)
Merge remote-tracking branch 'tile/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:56:56 +0000 (13:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:56:56 +0000 (13:56 +1100)
Conflicts:
arch/tile/kernel/intvec_32.S
arch/tile/lib/atomic_asm_32.S

1  2 
fs/nfs/nfs4filelayout.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/nfs4filelayout.c
Simple merge
Linux kernel for KaRo TX COM modules