Merge branch 'master' into openelec-pvr

packages/devel/glib/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="glib"
-PKG_VERSION="2.28.0"
+PKG_VERSION="2.28.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/devel/glib/patches/glib-2.28.1-linux_magic_h.patch

@@ -0,0 +1,24 @@
+diff -Naur glib-2.28.1-old/configure.ac glib-2.28.1-new/configure.ac
+--- glib-2.28.1-old/configure.ac	2011-02-17 20:33:11.000000000 -0800
++++ glib-2.28.1-new/configure.ac	2011-02-18 09:19:32.000000000 -0800
+@@ -858,6 +858,7 @@
+ AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h])
+ AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h])
+ AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
++AC_CHECK_HEADERS([linux/magic.h])
+ 
+ # check for structure fields
+ AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
+diff -Naur glib-2.28.1-old/glib/gfileutils.c glib-2.28.1-new/glib/gfileutils.c
+--- glib-2.28.1-old/glib/gfileutils.c	2011-02-11 07:23:12.000000000 -0800
++++ glib-2.28.1-new/glib/gfileutils.c	2011-02-18 09:19:32.000000000 -0800
+@@ -54,7 +54,9 @@
+ #include "glibintl.h"
+ 
+ #ifdef __linux__ /* for btrfs check */
++#ifdef HAVE_LINUX_MAGIC_H
+ #include <linux/magic.h>
++#endif
+ #include <sys/vfs.h>
+ #endif
+ 

packages/linux/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="2.6.37"
+PKG_VERSION="2.6.37.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/patches/linux-2.6.37-072-commit_ff2f078_fix.patch

@@ -1,19 +0,0 @@
-diff -Naur linux-2.6.37-old/drivers/usb/core/hcd.c linux-2.6.37-new/drivers/usb/core/hcd.c
---- linux-2.6.37-old/drivers/usb/core/hcd.c	2011-01-04 16:50:19.000000000 -0800
-+++ linux-2.6.37-new/drivers/usb/core/hcd.c	2011-01-30 20:06:09.000000000 -0800
-@@ -1956,7 +1956,6 @@
- 
- 	dev_dbg(&rhdev->dev, "usb %s%s\n",
- 			(msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume");
--	clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);
- 	if (!hcd->driver->bus_resume)
- 		return -ENOENT;
- 	if (hcd->state == HC_STATE_RUNNING)
-@@ -1964,6 +1963,7 @@
- 
- 	hcd->state = HC_STATE_RESUMING;
- 	status = hcd->driver->bus_resume(hcd);
-+	clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);
- 	if (status == 0) {
- 		/* TRSMRCY = 10 msec */
- 		msleep(10);