Merge branch 'queues/slirp' of git://git.kiszka.org/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Sun, 21 Aug 2011 19:19:29 +0000 (19:19 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sun, 21 Aug 2011 19:19:29 +0000 (19:19 +0000)
commitaeaa9bc7c663565b298ac97d4adcca45d9068ccb
treec73b76730d8670b2c97c1cd8e57d5479ab8b07ef
parent95f951cab585ac3495b5c4735289f57a00992fa7
parent4cf4db48bd5ec5d9475d155ea0fc147ec43146ed
Merge branch 'queues/slirp' of git://git.kiszka.org/qemu

* 'queues/slirp' of git://git.kiszka.org/qemu:
  slirp: Fix bit field types in IP header structs