]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 05:36:18 +0000 (16:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 05:36:18 +0000 (16:36 +1100)
commitf078d10cd93618b49107b6d0a3c9a3c456d0fdca
tree979840461bb78433ef2b655ca33cc89a6d967dd0
parent447da0bac8635cc4c5b47c0583e88bf33b6d904c
parent8a89322715d349920afb2ab9bf01949f09ee50db
Merge remote-tracking branch 'kvmtool/master'

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