tree 6fb157ccdc0002f9ffd983e8298cd2c0a5afd9d8
parent aaca322aba8518f3825506f48def7db30fd800d4
parent e16060a2f5dcd1dc7c2a1b9c9a09a534850256b1
author Blue Swirl <blauwirbel@gmail.com> 1313954369 +0000
committer Blue Swirl <blauwirbel@gmail.com> 1313954369 +0000

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