]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 03:46:57 +0000 (14:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 03:46:57 +0000 (14:46 +1100)
commit04be1f1e0caefc8422b5d39146b3310d6fea0a5b
treeeefd788716441313b68a3a5dac45ad7d1a86a55b
parent06b81c59959342af7a769724e3e10a6537f231ae
parent4b0ee1b76a3fa1b323503a1cd72b271b418ec238
Merge remote-tracking branch 'kvmtool/master'

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