genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-07-08 17:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

ramzswap: merge fubar fixed.

Browse Source
This commit is contained in:
Matt Sealey
2010-09-10 11:55:35 -05:00
parent a5d1eb0100
commit 0ca8a3b3d7
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/ramzswap/xvmalloc_int.h
View File

@@ -1,11 +1,7 @@
/*
* xvmalloc memory allocator
*
<<<<<<< HEAD
* Copyright (C) 2008, 2009, 2010 Nitin Gupta
=======
* Copyright (C) 2008, 2009 Nitin Gupta
>>>>>>> 644bf7b... Staging: xvmalloc memory allocator
*
* This code is released using a dual license strategy: BSD/GPL
* You can choose the licence that better fits your requirements.
@@ -66,11 +62,7 @@ struct link_free {
struct block_header {
union {
<<<<<<< HEAD
/* This common header must be XV_ALIGN bytes */
=======
/* This common header must be ALIGN bytes */
>>>>>>> 644bf7b... Staging: xvmalloc memory allocator
u8 common[XV_ALIGN];
struct {
u16 size;