]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'c6x/for-linux-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:19:46 +0000 (11:19 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:19:46 +0000 (11:19 +0200)
commit012be170a50c83fbc42c00ca536d14668b7cda6a
tree801667d7b6c69b40c776ab9d23885594720d355b
parent01682b10d90b05dc4167d6dfe6b21324e10c58eb
parentd90c3eb31535e0a1b7b5528ad2011e26f4b9a79a
Merge remote-tracking branch 'c6x/for-linux-next'

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