diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-18 15:41:43 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-18 15:41:43 -0600 |
commit | 914606d26e654d4c01bd5186f4d05e3fd445e219 (patch) | |
tree | c7f26d5e4b520b623e91c1b7ceffa6e4800bcc8e /net | |
parent | 5455a474d92e345df83212fd1b2f59d4a5d46ca9 (diff) | |
parent | 779ab5e3ddb9ad903f9a0ec21e148ed7bfd2d255 (diff) |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
configure: Earlier pkg-config probe
vmmouse_reset(): remove minimal code duplication
linux-user/syscall.c: remove wrong forward decl of setgroups()
fix build error on ARM due to wrong glibc check
gitignore: Add virtfs-proxy-helper
arm_gic: Add cpu nr to Raised IRQ message
zynq_slcr: Compile time warning fixes.
pflash_cfi0x: Send debug messages to stderr
pflash_cfi01: qemu_log_mask "unimplemented" msg
net, hub: fix the indent in the comments
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -256,7 +256,7 @@ void net_hub_info(Monitor *mon) /** * Get the hub id that a client is connected to * - * @id Pointer for hub id output, may be NULL + * @id: Pointer for hub id output, may be NULL */ int net_hub_id_for_client(NetClientState *nc, int *id) { |