---

yaml
---
r: 45224
b: refs/heads/master
c: d35a1b9
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8be7ed14f4f45e0cd19a70120a1526e1121af4b0
+refs/heads/master: d35a1b9e10481c9f1d3b87e778a0f1f6a0a2dd48

trunk/MAINTAINERS

@@ -532,13 +532,13 @@ L:	netdev@vger.kernel.org
 S:	Maintained
 
 ASUS ACPI EXTRAS DRIVER
-P:	Corentin Chary
-M:	corentincj@iksaif.net
 P:	Karol Kozimor
 M:	sziwan@users.sourceforge.net
+P:	Julien Lerouge
+M:	julien.lerouge@free.fr
 L:	acpi4asus-user@lists.sourceforge.net
 W:	http://sourceforge.net/projects/acpi4asus
-W:	http://xf.iksaif.net/acpi4asus
+W:	http://julien.lerouge.free.fr
 S:	Maintained
 
 ATA OVER ETHERNET DRIVER

trunk/arch/i386/kernel/acpi/boot.c

@@ -333,7 +333,7 @@ acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)
 /*
  * Parse Interrupt Source Override for the ACPI SCI
  */
-static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
+static void acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
 {
 	if (trigger == 0)	/* compatible SCI trigger is level */
 		trigger = 3;

trunk/drivers/acpi/ec.c

@@ -424,7 +424,7 @@ static void acpi_ec_gpe_query(void *ec_cxt)
 
 	snprintf(object_name, 8, "_Q%2.2X", value);
 
-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluating %s", object_name));
+	printk(KERN_INFO PREFIX "evaluating %s\n", object_name);
 
 	acpi_evaluate_object(ec->handle, object_name, NULL, NULL);
 }

trunk/drivers/hid/Kconfig

@@ -6,21 +6,13 @@ menu "HID Devices"
 
 config HID
 	tristate "Generic HID support"
-	depends on INPUT
 	default y
 	---help---
-	  A human interface device (HID) is a type of computer device that
-	  interacts directly with and takes input from humans. The term "HID"
-	  most commonly used to refer to the USB-HID specification, but other
-	  devices (such as, but not strictly limited to, Bluetooth) are
-	  designed using HID specification (this involves certain keyboards,
-	  mice, tablets, etc). This option compiles into kernel the generic
-	  HID layer code (parser, usages, etc.), which can then be used by
-	  transport-specific HID implementation (like USB or Bluetooth).
-
-	  For docs and specs, see http://www.usb.org/developers/hidpage/
-
-	  If unsure, say Y
+	  Say Y here if you want generic HID support to connect keyboards,
+	  mice, joysticks, graphic tablets, or any other HID based devices
+	  to your computer. You also need to select particular types of
+	  HID devices you want to compile support for, in the particular
+	  driver menu (USB, Bluetooth)
 
 endmenu
 

trunk/drivers/net/Space.c

@@ -349,11 +349,22 @@ static void __init trif_probe2(int unit)
 #endif
 
 
+/*
+ *	The loopback device is global so it can be directly referenced
+ *	by the network code. Also, it must be first on device list.
+ */
+extern int loopback_init(void);
+
 /*  Statically configured drivers -- order matters here. */
 static int __init net_olddevs_init(void)
 {
 	int num;
 
+	if (loopback_init()) {
+		printk(KERN_ERR "Network loopback device setup failed\n");
+	}
+
+
 #ifdef CONFIG_SBNI
 	for (num = 0; num < 8; ++num)
 		sbni_probe(num);

trunk/drivers/net/ifb.c

@@ -154,8 +154,8 @@ static int ifb_xmit(struct sk_buff *skb, struct net_device *dev)
 	int ret = 0;
 	u32 from = G_TC_FROM(skb->tc_verd);
 
-	stats->rx_packets++;
-	stats->rx_bytes+=skb->len;
+	stats->tx_packets++;
+	stats->tx_bytes+=skb->len;
 
 	if (!from || !skb->input_dev) {
 dropped:

trunk/drivers/net/loopback.c

@@ -229,11 +229,9 @@ struct net_device loopback_dev = {
 };
 
 /* Setup and register the loopback device. */
-static int __init loopback_init(void)
+int __init loopback_init(void)
 {
 	return register_netdev(&loopback_dev);
 };
 
-module_init(loopback_init);
-
 EXPORT_SYMBOL(loopback_dev);

trunk/drivers/net/sungem.c

@@ -90,8 +90,7 @@
 
 #define ADVERTISE_MASK	(SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | \
 			 SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | \
-			 SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full | \
-			 SUPPORTED_Pause | SUPPORTED_Autoneg)
+			 SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full)
 
 #define DRV_NAME	"sungem"
 #define DRV_VERSION	"0.98"