commit f8d56f1771e4867acc461146764b4feeb5245669
Merge: 3d6eadc... 92850bb...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:42:18 2008 -0700

    Merge branch 'for-linus' of git://neil.brown.name/md
    
    * 'for-linus' of git://neil.brown.name/md:
      md: allow extended partitions on md devices.
      md: use sysfs_notify_dirent to notify changes to md/dev-xxx/state
      md: use sysfs_notify_dirent to notify changes to md/array_state

commit 3d6eadcb5008beca1b289983ffd7771d1e947bac
Merge: a483ab1... 2a0bd75...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:40:59 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: psmouse - add support for Elantech touchpads
      Input: i8042 - add Blue FB5601 to noloop exception table

commit a483ab1dddf86a0e8924e94cf838eed602602b39
Merge: eba966a... 9c36645...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:37:37 2008 -0700

    Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
    
    * 'for-linus' of git://git.o-hand.com/linux-mfd:
      mfd: Make WM8400 depend on I2C until SPI is submitted
      mfd: add missing Kconfig entry for da903x

commit eba966a4e780199e31e8fd1d21bc9d187b1c9eaf
Merge: ecc96e7... ae5d82c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:35:41 2008 -0700

    Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
    
    * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
      uwb: build UWB before USB/WUSB

commit ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6
Merge: a1a739c... cc6e0bb...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:34:14 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: Add support for Sony Vaio VGX-TP1E
      HID: fix lock imbalance in hiddev
      HID: fix lock imbalance in hidraw
      HID: fix hidbus/appletouch device binding regression
      HID: add hid_type to general hid struct
      HID: quirk for OLED devices present in ASUS G50/G70/G71
      HID: Remove "default m" for Thrustmaster and Zeroplus
      HID: fix hidraw_exit section mismatch
      HID: add support for another Gyration remote control
      Revert "HID: Invert HWHEEL mappings for some Logitech mice"

commit a1a739c56ad031b8bf8b3804f568ac88899f8dd7
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Sat Oct 25 17:24:36 2008 -0700

    docbooks: fix fatal filename errors
    
    Fix docbook fatal errors (file location changed):
    
    docproc: lin2628-rc1/include/asm-x86/io_32.h: No such file or directory
    make[1]: *** [Documentation/DocBook/deviceiobook.xml] Error 1
    
    docproc: lin2628-rc1/include/asm-x86/atomic_32.h: No such file or directory
    make[1]: *** [Documentation/DocBook/kernel-api.xml] Error 1
    
    docproc: lin2628-rc1/include/asm-x86/mca_dma.h: No such file or directory
    make[1]: *** [Documentation/DocBook/mcabook.xml] Error 1
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 890c78c2d681a8dc89c78eb9177990cad3a77dc3
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Sat Oct 25 17:06:43 2008 -0700

    kernel-doc: allow more whitespace in macros
    
    Allow macros that are annotated with kernel-doc to contain whitespace
    between the '#' and "define".  It's valid and being used, so allow it.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7eea5b897eb6bbb79d7e6e398f4fbb61fcee57c7
Merge: 0173a32... 9fb3c5c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Oct 26 16:29:12 2008 -0700

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      leds-hp-disk: fix build warning
      ACPI: Oops in ACPI with git latest
      ACPI suspend: build fix for ACPI_SLEEP=n && XEN_SAVE_RESTORE=y.
      toshiba_acpi: always call input_sync() after input_report_switch()
      ACPI: Always report a sync event after a lid state change
      ACPI: cpufreq, processor: fix compile error in drivers/acpi/processor_perflib.c
      i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined
      i7300_idle: Cleanup based review comments
      i7300_idle: Disable ioat channel only on platforms where ile driver can load

commit 9fb3c5ca3dabe06758c35f790c68e273ed749e19
Merge: 438f8de... f371be6...
Author: Len Brown <len.brown@intel.com>
Date:   Sat Oct 25 04:07:44 2008 -0400

    Merge branch 'i7300_idle' into release

commit 438f8de46bc261b35d84771ae9992cfff3ff4dd8
Author: Len Brown <len.brown@intel.com>
Date:   Sat Oct 25 03:52:16 2008 -0400

    leds-hp-disk: fix build warning
    
    drivers/leds/leds-hp-disk.c:59: warning: passing argument 4 of ‘acpi_evaluate_integer’ from incompatible pointer type
    
    Signed-off-by: Len Brown <len.brown@intel.com>

commit f8123381bae8d581d81f24b55719db3d9a6a262c
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date:   Fri Oct 24 21:50:31 2008 +0200

    ACPI: Oops in ACPI with git latest
    
    ACPI Warning (nseval-0168): Insufficient arguments - method [_OSC] needs 5, found 4 [20080926]
    ACPI Warning (nspredef-0252): \_SB_.PCI0._OSC: Parameter count mismatch - ASL declared 5, expected 4 [20080926]
    ACPI Error (nspredef-0163): \_SB_.PCI0._OSC: Missing expected return value [20080926]
    BUG: unable to handle kernel NULL pointer dereference at 00000000
    IP: [<c0237671>] acpi_run_osc+0xa1/0x170
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Tested-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 92daa7b53b76984565dfdfda5d9c679884121fb2
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date:   Thu Oct 23 21:46:43 2008 +0200

    ACPI suspend: build fix for ACPI_SLEEP=n && XEN_SAVE_RESTORE=y.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit cab08969188e2da09923fe9c4a99ec9b934b0708
Author: Len Brown <len.brown@intel.com>
Date:   Fri Oct 24 15:39:47 2008 -0400

    toshiba_acpi: always call input_sync() after input_report_switch()
    
    Signed-off-by: Len Brown <len.brown@intel.com>

commit df316e939100e789b3c5d4d102619ccf5834bd00
Author: Guillem Jover <guillem.jover@nokia.com>
Date:   Fri Oct 24 00:28:33 2008 +0300

    ACPI: Always report a sync event after a lid state change
    
    Currently not always an EV_SYN event is reported to userland
    after the EV_SW SW_LID event has been sent. This is easy to verify
    by using “input-events” from input-utils and just closing and opening
    the lid.
    
    Signed-off-by: Guillem Jover <guillem.jover@nokia.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 16be87ea170ae6cfaa9f47f79d14f7577d8cb420
Author: Miao Xie <miaox@cn.fujitsu.com>
Date:   Fri Oct 24 17:22:04 2008 +0800

    ACPI: cpufreq, processor: fix compile error in drivers/acpi/processor_perflib.c
    
    When trying to build 2.6.28-rc1 on ia64, make aborts with:
    
      CC      drivers/acpi/processor_perflib.o
      drivers/acpi/processor_perflib.c:41:28: error: asm/cpufeature.h: No such file or directory
      drivers/acpi/processor_perflib.c: In function ‘acpi_processor_get_performance_info’:
      drivers/acpi/processor_perflib.c:364: error: implicit declaration of function ‘boot_cpu_has’
      drivers/acpi/processor_perflib.c:364: error: ‘X86_FEATURE_EST’ undeclared (first use in this function)
      drivers/acpi/processor_perflib.c:364: error: (Each undeclared identifier is reported only once
      drivers/acpi/processor_perflib.c:364: error: for each function it appears in.)
      make[2]: *** [drivers/acpi/processor_perflib.o] Error 1
      make[1]: *** [drivers/acpi] Error 2
      make: *** [drivers] Error 2
    
    this patch fix it.
    
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Acked-by: Thomas Renninger <trenn@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit f371be6352cdde3df2253b76acb979480e93ce4f
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Thu Oct 23 15:39:06 2008 -0700

    i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined
    
    When I7300_idle driver is not configured, there is a compile time
    warning about IDLE_IOAT_CHANNEL not defined. Fix it.
    
    Reported-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Reported-by: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 33093e186c8f80b443fafb1d347a140bdd2b86c6
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Wed Oct 22 16:51:03 2008 -0700

    i7300_idle: Cleanup based review comments
    
    Cleanup of i7300 idle driver based on review comments from Randy Dunlap,
    Andi Kleen and Len Brown.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 3ad0b02e4c1d5feba44b8ff48dccd1ba61a826b0
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Wed Oct 22 16:34:52 2008 -0700

    i7300_idle: Disable ioat channel only on platforms where ile driver can load
    
    Based on input from Andi Kleen:
    share the platform detection code with ioat_dma and disable the channel in
    dma engine only for specific platforms.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 9c366452e0b2df06f3ce0aabc6a53c94c595cd00
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Fri Oct 24 17:16:11 2008 +0200

    mfd: Make WM8400 depend on I2C until SPI is submitted
    
    Otherwise we could build in WM8400 but not I2C.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

commit 8e2eaabfd9f7d375a1bb202e644ce2dcc0659592
Author: Samuel Ortiz <sameo@openedhand.com>
Date:   Fri Oct 24 17:10:05 2008 +0200

    mfd: add missing Kconfig entry for da903x
    
    This one was accidentally left out during the rc1 mfd merge.
    
    Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

commit ae5d82cb8d600989338bbda5ea38f5c0ff47175a
Author: David Vrabel <david.vrabel@csr.com>
Date:   Fri Oct 24 16:46:22 2008 +0100

    uwb: build UWB before USB/WUSB
    
    The WHCI-HCD driver in drivers/usb/host/ depends on the umc driver in
    drivers/uwb/.
    
    Signed-off-by: David Vrabel <david.vrabel@csr.com>

commit cc6e0bbb47f02fd36cd55b3189c0c79079096ab8
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Thu Oct 23 12:58:38 2008 +0200

    HID: Add support for Sony Vaio VGX-TP1E
    
    The Sony Vaio VGX-TP1E multimedia PC has a wireless keyboard with
    a touchpad.
    
    The mouse pointer is wrongly declared as constant non-data variable, which make
    HID code to completely ignore all the "Pointer" usages.
    Fix the report descriptor before it enters the parser to contain touchpad
    pointer description that is correctly parsable (declaring data rather than
    constant).
    
    Reported-by: Stefan Hundhammer <sh@suse.de>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit eb9910894d7857c273e049b297fd6251e5ecc43e
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Thu Oct 23 01:47:34 2008 +0200

    HID: fix lock imbalance in hiddev
    
    Don't forget to unlock_kernel() in hiddev_ioctl_usage().
    Added in 7961df16819085b8a357720d89d0239036e6af2a
    (HID: Switch hiddev to unlocked_ioctl).
    
    Corresponing sparse warning:
    drivers/hid/usbhid/hiddev.c:515:10: warning: context imbalance in 'hiddev_ioctl_usage': wrong count at exit
    drivers/hid/usbhid/hiddev.c:515:10:    context 'kernel_lock': wanted 0, got 1
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 0f2c5945a917e776ccd394f0e1924e9502c2795f
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Thu Oct 23 01:47:30 2008 +0200

    HID: fix lock imbalance in hidraw
    
    Add omitted unlock_kernel() to hidraw_ioctl().
    Added in 979c407e3b89b606e810fa494ef316896eadbfad
    (HID: Push down BKL into ioctl handler in hidraw).
    
    Corresponing sparse warning:
    drivers/hid/hidraw.c:267:9: warning: context imbalance in 'hidraw_ioctl': wrong count at exit
    drivers/hid/hidraw.c:267:9:    context 'kernel_lock': wanted 0, got 1
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit b4d8e4736c94e78fd846dca0c95a3a0710582584
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Wed Oct 22 14:47:18 2008 +0200

    HID: fix hidbus/appletouch device binding regression
    
    The appletouch mouse devices are grabbed by the hid bus and not
    released even if apple driver says ENODEV (as expected) -- these
    are composite USB devices, for which we only ignore the mouse
    interface. This is currently not handled by hidbus code properly.
    
    Move the ignoring one level upper to forbid the hid layer to grab the
    device.
    
    Reported-by: Justin Mattock <justinmattock@gmail.com>
    Reported-by: Steven Noonan <steven@uplinklabs.net>
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit a73a63701f8f23e70674b3c5e367a0a726c18468
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Wed Oct 22 14:45:11 2008 +0200

    HID: add hid_type to general hid struct
    
    Add type to the hid structure to distinguish to which device type
    (now only mouse) we are talking to. Needed for per device type ignore
    list support.
    
    Note: this patch leaves the type as unknown for bluetooth devices,
    there is not support for this in the hidp code.
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 92850bbd71228730c80efd491e7427650188d359
Author: NeilBrown <neilb@suse.de>
Date:   Tue Oct 21 13:25:32 2008 +1100

    md: allow extended partitions on md devices.
    
    The new extended partition support provides a much nicer was
    to have partitions on md devices that the 'mdp' alternate major.
    We cannot really get rid of 'mdp' at this time, but we can
    enable extended partitions as that will probably make life
    easier for sysadmins.
    
    Signed-off-by: NeilBrown <neilb@suse.de>

commit 3c0ee63a64a20351ed6c16ec797e1f8c850741ea
Author: NeilBrown <neilb@suse.de>
Date:   Tue Oct 21 13:25:28 2008 +1100

    md: use sysfs_notify_dirent to notify changes to md/dev-xxx/state
    
    The 'state' file for a device reports, for example, when the device
    has failed.  Changes should be reported to userspace ASAP without
    the possibility of blocking on low-memory.  sysfs_notify does
    have that possibility (as it takes a mutex which can be held
    across a kmalloc) so use sysfs_notify_dirent instead.
    
    Signed-off-by: NeilBrown <neilb@suse.de>

commit b62b75905d571c29262a6c38cf9e5f089c203871
Author: NeilBrown <neilb@suse.de>
Date:   Tue Oct 21 13:25:21 2008 +1100

    md: use sysfs_notify_dirent to notify changes to md/array_state
    
    Now that we have sysfs_notify_dirent, use it to notify changes
    to md/array_state.
    As sysfs_notify_dirent can be called in atomic context, we can
    remove the delayed notify and the MD_NOTIFY_ARRAY_STATE flag.
    
    Signed-off-by: NeilBrown <neilb@suse.de>

commit ac2d98998c32fcdc8d8919b7a4536a7945fd0422
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Mon Oct 20 12:37:43 2008 +0200

    HID: quirk for OLED devices present in ASUS G50/G70/G71
    
    The new revision of OLED device (0x0b05/0x175b) found in ASUS G50/G70/G71
    should be ignored the same way we currently do for 0x1726, so that asus_oled
    driver can make use of the device.
    
    Reported-by: Costin Grigoras <costin.grigoras@cern.ch>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 550cb3c3c1fa48171c6358b8641bd01119f5386f
Author: Andi Kleen <ak@linux.intel.com>
Date:   Sun Oct 19 20:34:31 2008 +0200

    HID: Remove "default m" for Thrustmaster and Zeroplus
    
    No reason at all to make these obscure drivers default m
    
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 140ae3eb6feb6ae96ba1ff073049beb985ea00e8
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Fri Oct 17 18:04:48 2008 +0200

    HID: fix hidraw_exit section mismatch
    
    hidraw_exit() marked as __exit is called from __init function
    from HID core. Remove the section placement from that function.
    
    Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 1e093206734568e780c2717da1c89b97e9471954
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Fri Oct 17 11:52:23 2008 +0200

    HID: add support for another Gyration remote control
    
    There is a slightly different Gyration remote control, which
    requires the quirks we already have in place for the 0x0002 PID,
    plus KEY_MEDIA mapping is different.
    
    Reported-by: Marc Randolph <mrand@pobox.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 022b7024d4bb1f9a2f30021a2672a0f940ebfa7a
Author: Dan Nicholson <dbn.lists@gmail.com>
Date:   Fri Oct 17 11:29:46 2008 +0200

    Revert "HID: Invert HWHEEL mappings for some Logitech mice"
    
    This reverts commit 740f370dc61dc478d891d7d47660bb3ae39ddb4f.
    
    It turned out to be correct in the first place: a positive value should
    be sent when the wheel is moved to the right, and a negative value when
    moved to the left. This is the behavior expected by the Xorg evdev
    driver. I must have had a remapping somewhere else in my system when
    originally testing this. Testing on another system shows that the
    unpatched kernel is correct.
    
    Here is a bug report from Mandriva that brought the problem to my
    attention:
    
        https://qa.mandriva.com/show_bug.cgi?id=44309#c19
    
    Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 2a0bd75e5e687a9c34921e942c18477ea7ec2d63
Author: Arjan Opmeer <arjan@opmeer.net>
Date:   Thu Oct 16 22:10:19 2008 -0400

    Input: psmouse - add support for Elantech touchpads
    
    This is version 5 of the driver. Relative mode support has been
    dropped (users wishing to use touchpad in relative mode can use
    standard PS/2 protocol emulation done in hardware). The driver
    supports both original version of Elantech protocol and the newer
    one used by touchpads installed in EeePC.
    
    Signed-off-by: Arjan Opmeer <arjan@opmeer.net>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 2c6f2cb83b239b7d45da9246cafd27ee615ee35b
Author: Stefan Bader <stefan.bader@canonical.com>
Date:   Thu Oct 16 22:00:56 2008 -0400

    Input: i8042 - add Blue FB5601 to noloop exception table
    
    Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>