| commit | 42a6f56f1d96574bb3ba093c740fb1e23446ea24 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Sun, 18 Oct 2009 03:45:36 +0000 (18 01:45 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Sun, 18 Oct 2009 03:45:36 +0000 (18 01:45 -0200) | ||
| tree | de077ffb968b3afb6c1edf9739336219d55e37e6 | treesnapshot (tar.gz zip) |
| parent | 3c620108aae0f1e7f8b06f04275e9bdc2d6f46f6 | commitdiff |
| parent | 1cfb59bcfe049c7982d95098c1af0e6d3d421c9f | commitdiff |
Merge branch 'upstream-merge'
* upstream-merge:
Only IDE needs limits for CHS configuration
MIPS jazz: create isa bus
ksm support
multiboot: Limit number of multiboot modules
pcnet: Extend hardware reset
multiboot: Fix cmdline of modules
qcow2: Bring synchronous read/write back to life
Documentation: Move msmouse description to an appropriate place
Documentation: Add missing tags to placeholders
Documentation: Highlight placeholders in suboptions
net: fix multiple NICs causing net opts process to stop
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* upstream-merge:
Only IDE needs limits for CHS configuration
MIPS jazz: create isa bus
ksm support
multiboot: Limit number of multiboot modules
pcnet: Extend hardware reset
multiboot: Fix cmdline of modules
qcow2: Bring synchronous read/write back to life
Documentation: Move msmouse description to an appropriate place
Documentation: Add missing tags to placeholders
Documentation: Highlight placeholders in suboptions
net: fix multiple NICs causing net opts process to stop
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>