]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4848490 ff07eb8)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Oct 2009 22:35:16 +0000 (07:35 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Oct 2009 22:35:16 +0000 (07:35 +0900)
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  move virtrng_remove to .devexit.text
  move virtballoon_remove to .devexit.text
  virtio_blk: Revert serial number support
  virtio: let header files include virtio_ids.h
  virtio_blk: revert QUEUE_FLAG_VIRT addition

1  2 
drivers/net/virtio_net.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/virtio_net.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.