openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3.3-rc6 into driver-core-next

Browse Source 
This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2012-03-09 12:35:53 -08:00
parent 54d20f006c 192cfd5877
commit 263a5c8e16
1075 changed files with 8469 additions and 46875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/hyperv.h
View File

@ -176,7 +176,7 @@ struct hv_kvp_msg {
#include <linux/mod_devicetable.h>
#define MAX_PAGE_BUFFER_COUNT 18
#define MAX_PAGE_BUFFER_COUNT 19
#define MAX_MULTIPAGE_BUFFER_COUNT 32 /* 128K */
#pragma pack(push, 1)