]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ia64/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 00:18:04 +0000 (10:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 00:18:04 +0000 (10:18 +1000)
commit08a842fc1b8e4fb93a68054eeb4677694d304f3a
treeae2f533b7070ffda7608e6a2bb35306afda7cb36
parent642393cf4834df5938adc1b580874f527a0b9285
parent9c510f75fd453b101cb165c95ccfb45c4cac7d56
Merge remote-tracking branch 'ia64/next'

Conflicts:
arch/ia64/configs/generic_defconfig
arch/ia64/configs/gensparse_defconfig
arch/ia64/configs/tiger_defconfig
arch/ia64/configs/xen_domu_defconfig
arch/ia64/configs/generic_defconfig
arch/ia64/configs/gensparse_defconfig
arch/ia64/configs/tiger_defconfig
arch/ia64/configs/xen_domu_defconfig