]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 02:34:52 +0000 (13:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 02:34:52 +0000 (13:34 +1100)
commit45725b6ff41da3b70c742c19853e77dc1a90f947
treeee74d86f58b5017713501207bd108398a5c4cd72
parentbb063136806b43ea90f746c16e531b72ed5de139
parent4551caa40d39f850be0b9c1c2be17df921df99b2
Merge remote-tracking branch 'kvmtool/master'

Conflicts:
include/net/9p/9p.h
scripts/kconfig/Makefile
MAINTAINERS
arch/x86/Kconfig
scripts/kconfig/Makefile