Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPV4/IPV6]: Fix inet{,6} device initialization order.
  [TCP]: Use old definition of before
  [NETFILTER]: ebtables: don't compute gap before checking struct type
  [NETFILTER]: nf_nat: fix MASQUERADE crash on device down
  [NETFILTER]: New connection tracking is not EXPERIMENTAL anymore
  [NETFILTER]: Fix routing of REJECT target generated packets in output chain
  [NETFILTER]: compat offsets size change
  [SUNGEM]: PHY updates & pause fixes (#2)
  [X25]: proper prototype for x25_init_timers()
  [AF_NETLINK]: module_put cleanup
  [XFRM_USER]: avoid pointless void ** casts
  [NETFILTER] xt_hashlimit.c: fix typo
  [NET] drivers/net/loopback.c: convert to module_init()
  [PKTGEN]: Convert to kthread API.
  [NET]: ifb double-counts packets

diff --git a/MAINTAINERS b/MAINTAINERS
index 7f6c051..0f6d13b 100644 (file)
--- a/MAINTAINERS
+++ b/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://julien.lerouge.free.fr
+W:     http://xf.iksaif.net/acpi4asus
 S:     Maintained
 
 ATA OVER ETHERNET DRIVER

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 094300b..cbcb2c2 100644 (file)
--- a/arch/i386/kernel/acpi/boot.c
+++ b/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 acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
+static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
 {
        if (trigger == 0)       /* compatible SCI trigger is level */
                trigger = 3;

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 9c52d87..4144d5d 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/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);
 
-       printk(KERN_INFO PREFIX "evaluating %s\n", object_name);
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluating %s", object_name));
 
        acpi_evaluate_object(ec->handle, object_name, NULL, NULL);
 }

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 96d4a0b..ec796ad 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -6,13 +6,21 @@ menu "HID Devices"
 
 config HID
        tristate "Generic HID support"
+       depends on INPUT
        default y
        ---help---
-         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)
+         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
 
 endmenu
 

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index f877cd4..258a5d0 100644 (file)
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -12,10 +12,8 @@ config USB_HID
        ---help---
          Say Y here if you want full HID support to connect USB keyboards,
          mice, joysticks, graphic tablets, or any other HID based devices
-         to your computer via USB. You also need to select HID Input layer
-         support (below) if you want to use keyboards, mice, joysticks and
-         the like ... as well as Uninterruptible Power Supply (UPS) and
-         monitor control devices.
+         to your computer via USB, as well as Uninterruptible Power Supply
+         (UPS) and monitor control devices.
 
          You can't use this driver and the HIDBP (Boot Protocol) keyboard
          and mouse drivers at the same time. More information is available:

diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 61587ca..fde1d95 100644 (file)
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -121,7 +121,7 @@ static int corgibl_probe(struct platform_device *pdev)
                machinfo->limit_mask = -1;
 
        corgi_backlight_device = backlight_device_register ("corgi-bl",
-               NULL, &corgibl_data);
+               &pdev->dev, NULL, &corgibl_data);
        if (IS_ERR (corgi_backlight_device))
                return PTR_ERR (corgi_backlight_device);
 

diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index 1c569fb..c07d820 100644 (file)
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -105,7 +105,7 @@ static struct backlight_properties hp680bl_data = {
 static int __init hp680bl_probe(struct platform_device *dev)
 {
        hp680_backlight_device = backlight_device_register ("hp680-bl",
-               NULL, &hp680bl_data);
+               &dev->dev, NULL, &hp680bl_data);
        if (IS_ERR (hp680_backlight_device))
                return PTR_ERR (hp680_backlight_device);
 

diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index 2d79054..fc812d9 100644 (file)
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -184,7 +184,7 @@ static int locomolcd_probe(struct locomo_dev *ldev)
 
        local_irq_restore(flags);
 
-       locomolcd_bl_device = backlight_device_register("locomo-bl", NULL, &locomobl_data);
+       locomolcd_bl_device = backlight_device_register("locomo-bl", &ldev->dev, NULL, &locomobl_data);
 
        if (IS_ERR (locomolcd_bl_device))
                return PTR_ERR (locomolcd_bl_device);

diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 9e6c23c..ebc1f69 100644 (file)
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -105,7 +105,7 @@
 
 /* Maximum object reference count (detects object deletion issues) */
 
-#define ACPI_MAX_REFERENCE_COUNT        0x800
+#define ACPI_MAX_REFERENCE_COUNT        0x1000
 
 /* Size of cached memory mapping for system memory operation region */