]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ia64/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:11:11 +0000 (10:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:11:11 +0000 (10:11 +1100)
commit07f3cbe2b1b4c48a4cdd962367f624a13b7d3626
treefb2306faf01f462bf9de1e28bb0556901f0f0ebe
parent5a021bc594327df3455a65a46111fc9f66a58ca1
parentf68301fee71510300140990c4e7a2769801fbd70
Merge remote-tracking branch 'ia64/next'

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