]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'livepatching/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 08:30:33 +0000 (18:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 08:30:33 +0000 (18:30 +1000)
commit066afced7b25c16d7f611816b9bf6e5f95425d10
treec5eb94ad0bcee2eed0a7153cf192d2587f485d98
parentce18995f0c7d619508c43298b77c97a953620018
parent075b759be1bbdeb215d7eba6a0db70883ad5acb2
Merge remote-tracking branch 'livepatching/for-next'

Conflicts:
arch/s390/Kconfig
arch/s390/Kconfig