]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitb86494f8491f86870f191742aa46c8f36ac72cfa
treed126bbfa3df7e3def5c9857adf35e4a18cd44563
parentb3fe21bb2b5402104bdac290b5c6e19dce317595
parent0124538885485603ac1fbabe3aff570147f7c8a3
Merge remote-tracking branch 'tile/master'

Conflicts:
arch/tile/kernel/intvec_32.S
arch/tile/lib/atomic_asm_32.S
fs/nfs/nfs4filelayout.c