]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'm68k/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:20:09 +0000 (11:20 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:20:09 +0000 (11:20 +0200)
1  2 
arch/m68k/platform/68360/config.c

Simple merge