]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xtensa/for_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:41:00 +0000 (09:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:41:00 +0000 (09:41 +1100)
commitec356e3c94de2172a45fb6769db25c294498606e
tree2aed79775f7cafd23cf578d9df3f23803fa6bf18
parenta14f33384ac0b19f73f7cd94f52e2aab73e239ad
parentded389d476027ac271c176c01631d0da3d36c480
Merge remote-tracking branch 'xtensa/for_next'

Conflicts:
arch/xtensa/boot/boot-elf/Makefile
scripts/mod/modpost.c