]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 07:00:40 +0000 (18:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 07:00:40 +0000 (18:00 +1100)
commit42825cb479bf0e03ce24d1ce70687c1842a4335a
treecb602d15eccb0d6770d9511574724323236f08c9
parentf57cdb07b6f35a559f3282cf5950db48067b3f12
parent604515a0472d2dab70b5d6841421f3cc02dead5d
Merge remote-tracking branch 'kvmtool/master'

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