]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ia64/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 23:53:50 +0000 (10:53 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 23:53:50 +0000 (10:53 +1100)
commite54f6599db59a25c8af3a43b956b8ce364e66942
tree46bc8a8ea1305f5b7ec5dc9d42b2dbf77a8ea759
parent5fabbbf8b573b5bc6c0e0448854340c7a39ec891
parentf68301fee71510300140990c4e7a2769801fbd70
Merge remote-tracking branch 'ia64/next'

Conflicts:
arch/ia64/include/asm/Kbuild
arch/ia64/include/asm/Kbuild