]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ia64/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:33:25 +0000 (10:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:33:25 +0000 (10:33 +1100)
commit0757ab5713933f84938c8bd7a30782f074512e58
treeb396640ed0ef2db08ea62c93d476a4580dac397f
parent7449fb78d6574302a467a8774e82a386cdf572f7
parentf68301fee71510300140990c4e7a2769801fbd70
Merge remote-tracking branch 'ia64/next'

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