Merge 3.1-rc4 into staging-next

This resolves a conflict with: drivers/staging/brcm80211/brcmsmac/types.h Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
git-mirror · Aug 29, 2011 · 6eafa46 · 6eafa46
2 parents c6a389f + b9c4dec
commit 6eafa46
Show file tree

Hide file tree

Showing 605 changed files with 99,186 additions and 119,169 deletions.
diff --git a/arch/x86/include/asm/hyperv.h b/arch/x86/include/asm/hyperv.h
@@ -189,5 +189,6 @@
 #define HV_STATUS_INVALID_HYPERCALL_CODE	2
 #define HV_STATUS_INVALID_HYPERCALL_INPUT	3
 #define HV_STATUS_INVALID_ALIGNMENT		4
+#define HV_STATUS_INSUFFICIENT_BUFFERS		19
 
 #endif