]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 01:38:31 +0000 (12:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 01:38:31 +0000 (12:38 +1100)
commit048fe607c2a2bc1cc3458427ecef41fe52cb49c9
tree186f25e8665a8f1c044da3dd4f25acc40a4a5784
parentd945966b0fe73964c0215edec7fa1c68a5fca8aa
parent27f8c15461d83e23e7eab245c8ab15c8878369d8
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig.debug
arch/m68k/Kconfig.debug