]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'dwmw2/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 19 Feb 2013 23:37:15 +0000 (10:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 19 Feb 2013 23:37:15 +0000 (10:37 +1100)
commit3adafed6730b74b030966e954e1a12a8e353549b
tree00d0a0afc5090f21bf14770f45f46b882a7a90bd
parent79409e07f95de645bf328970f6108118f74a0de7
parent084a0ec1e3704d6c3714a665db755d581f797f67
Merge remote-tracking branch 'dwmw2/master'

Conflicts:
arch/x86/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig