]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:47:55 +0000 (14:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:47:55 +0000 (14:47 +1000)
commita57661c3f3711b00a2e0168ff8787f6718addf6a
tree639434b9ebf1d6eb1d9c656d8bfe03035c32209c
parent3a6d17b8de39bcc7365d659fa51da45554da5f84
parent33b3aa018de3309ce6eb1ccf51d5f91db7536fec
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/net/virtio_net.c
arch/x86/kernel/apic/apic_numachip.c
arch/x86/kernel/apic/x2apic_phys.c
drivers/net/virtio_net.c