]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 03:38:17 +0000 (14:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 03:38:17 +0000 (14:38 +1100)
commita6a9ce3c4fa62a420bf2fee5ae24fda08e43979f
tree7ac47cdac20b2527ae1c1245843f627df2084623
parente850d55bb84b954c849642d417cabe181d648d9f
parentd5e6b9fa5d5a8d08f79b379bc95c42926abbc047
Merge remote-tracking branch 'kvmtool/master'

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