]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'c6x/for-linux-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:32:34 +0000 (14:32 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:32:34 +0000 (14:32 +0200)
commit2eaea13b4b586ea832d08cefb3f44f2824426fe2
treec81de489bdca851ead91be3d1a00e86ab3ba04ca
parent845ef1e049303272ce7f63c3e6e355f55f5cf38f
parentd90c3eb31535e0a1b7b5528ad2011e26f4b9a79a
Merge remote-tracking branch 'c6x/for-linux-next'

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/sparc/Kconfig
arch/x86/Kconfig