From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/libhugetlbfs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libhugetlbfs') diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile index 53659c949..dca03494e 100644 --- a/package/libhugetlbfs/Makefile +++ b/package/libhugetlbfs/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2.11 PKG_RELEASE:= 2 PKG_MD5SUM:= 35e68f16b704f2e339622a8ca07fdee0 PKG_DESCR:= easy hugepage access -PKG_SECTION:= libs +PKG_SECTION:= libs/misc PKG_URL:= http://libhugetlbfs.ozlabs.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/} PKG_OPTS:= dev -- cgit v1.2.3