]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorMarcelo Tosatti <mtosatti@redhat.com>
Tue, 15 Jun 2010 21:35:10 +0000 (18:35 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Tue, 15 Jun 2010 21:35:10 +0000 (18:35 -0300)
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
1  2 
arch/s390/kvm/kvm-s390.c

Simple merge