[git pull] Input updates for 2.6.26-rc6

Hi Linus,

Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
or
master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus

to receive updates for the input subsystem. There will be a small
conflict in drivers/usb/core/quirks.c, I hope this is OK because I don't
like to have merges on my 'for-linus' branch except for the one done in
merge window for the next release. This way one can clearly see what
went in into a release after the initial merge.

Changelog:
---------

Jiri Kosina (2):
Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table
Input: i8042 - retry failed CTR writes when resuming

Oliver Neukum (1):
Input: appletouch - implement reset-resume logic

Stas Sergeev (1):
Input: pcspkr - remove negative dependency on snd-pcsp


Diffstat:
--------

drivers/input/misc/Kconfig | 1 -
drivers/input/mouse/appletouch.c | 49 +++++++++++++++++++++++++++-----
drivers/input/serio/i8042-x86ia64io.h | 7 +++++
drivers/input/serio/i8042.c | 8 ++++-
drivers/usb/core/quirks.c | 3 ++
5 files changed, 57 insertions(+), 11 deletions(-)

--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Relevant Pages

  • Re: update-update conflict on same node
    ... Updates are done on node 1 ... "An update-update conflict between peer 1 ... The incoming update was ...
    (microsoft.public.sqlserver.replication)
  • update-update conflict on same node
    ... I have spent quite a day or so dealing with an issue that I can make little ... Updates are done on node 1 only. ... and peer 1 was detected and resolved. ... What I find strange is it appears to be a conflict with itself? ...
    (microsoft.public.sqlserver.replication)
  • Re: Automatic updates becoming compulsory?
    ... had to pull the plug pdq to stop service pack three loading without so much ... Again, luckily, I have a wireless connection and can instantly pull the usb ... I always have my machines set to inform me of updates and only allow those ...
    (microsoft.public.windowsxp.general)
  • Re: Same row being updated and deleted
    ... What is the action in the profiler I could use to see all the updates I have ... >> How can I study the conflict more detail? ... >>> Looking for a SQL Server replication book? ...
    (microsoft.public.sqlserver.replication)
  • Re: Merge Replication over Internet with MSDE and Sql Server (Urgent)
    ... and a conflict occurs you get a dialog telling you ... > Create your publication for anonymous pull. ... > You will need to specify the publisher name, ... > Looking for a book on SQL Server replication? ...
    (microsoft.public.sqlserver.replication)
Loading