1. 02 Apr, 2006 13 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input · 9c8680e2
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: (26 commits)
        Input: add support for Braille devices
        Input: synaptics - limit rate to 40pps on Toshiba Protege M300
        Input: gamecon - add SNES mouse support
        Input: make modalias code respect allowed buffer size
        Input: convert /proc handling to seq_file
        Input: limit attributes' output to PAGE_SIZE
        Input: gameport - fix memory leak
        Input: serio - fix memory leak
        Input: zaurus keyboard driver updates
        Input: i8042 - fix logic around pnp_register_driver()
        Input: ns558 - fix logic around pnp_register_driver()
        Input: pcspkr - separate device and driver registration
        Input: atkbd - allow disabling on X86_PC (if EMBEDDED)
        Input: atkbd - disable softrepeat for dumb keyboards
        Input: atkbd - fix complaints about 'releasing unknown key 0x7f'
        Input: HID - fix duplicate key mapping for Logitech UltraX remote
        Input: use kzalloc() throughout the code
        Input: fix input_free_device() implementation
        Input: initialize serio and gameport at subsystem level
        Input: uinput - semaphore to mutex conversion
        ...
      9c8680e2
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · f900e582
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
        [PATCH] powerpc: iSeries needs slb_initialize to be called
        powerpc: hook up the splice syscall
        [PATCH] powerpc/cell: compile fixes
        [PATCH] powerpc: trivial spelling fixes in fault.c
        [PATCH] powerpc/pseries: EEH Cleanup
        [PATCH] powerpc/pseries: misc lparcfg fixes
        [PATCH] powerpc/pseries: fix device name printing, again.
        [PATCH] powerpc: Extends HCALL interface for InfiniBand usage
        [PATCH] powerpc/pseries: Change H_StudlyCaps to H_SHOUTING_CAPS
        [PATCH] powerpc/pseries: print message if EEH recovery fails
        [PATCH] powerpc/pseries: mutex lock to serialize EEH event processing
        powerpc: converted embedded platforms to use new define_machine support
        powerpc: merge machine_check_exception between ppc32 & ppc64
      f900e582
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 23344cb3
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC]: Wire up sys_sync_file_range() into syscall tables.
        [SPARC]: Wire up sys_splice() into the syscall tables.
        [SPARC64]: Update defconfig.
        [SPARC64]: Align address in huge_pte_alloc().
        [SPARC64]: Document the instruction checks we do in do_sparc64_fault().
        [SPARC64]: Make tsb_sync() mm comparison more precise.
      23344cb3
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · bacd3add
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NET]: Fully fix the memory leaks in sys_accept().
        [NETFILTER]: iptables 32bit compat layer
        [NETFILTER]: {ip,nf}_conntrack_netlink: fix expectation notifier unregistration
        [NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink
        [NETFILTER]: x_tables: unify IPv4/IPv6 multiport match
        [NETFILTER]: x_tables: unify IPv4/IPv6 esp match
        [NET]: Fix dentry leak in sys_accept().
        [IPSEC]: Kill unused decap state structure
        [IPSEC]: Kill unused decap state argument
        [NET]: com90xx kmalloc fix
        [TG3]: Update driver version and reldate.
        [TG3]: Revert "Speed up SRAM access"
      bacd3add
    • Linus Torvalds's avatar
      splice: add SPLICE_F_NONBLOCK flag · 29e35094
      Linus Torvalds authored
      It doesn't make the splice itself necessarily nonblocking (because the
      actual file descriptors that are spliced from/to may block unless they
      have the O_NONBLOCK flag set), but it makes the splice pipe operations
      nonblocking.
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      29e35094
    • Linus Torvalds's avatar
      ppc64: actually add sys_splice() to the system call table · b45e516f
      Linus Torvalds authored
      (We'd only added the number, which meant that actually trying
      to use splice just went off into la-la-land)
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      b45e516f
    • Samuel Thibault's avatar
      Input: add support for Braille devices · b9ec4e10
      Samuel Thibault authored
      - Add KEY_BRL_* input keys and K_BRL_* keycodes;
      - Add emulation of how braille keyboards usually combine braille dots
        to the console keyboard driver;
      - Add handling of unicode U+28xy diacritics.
      Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
      b9ec4e10
    • Richard Thrippleton's avatar
      Input: synaptics - limit rate to 40pps on Toshiba Protege M300 · 53a2670c
      Richard Thrippleton authored
      Toshiba Protege M300 also requires the same workaround as Satellites
      and Dynabooks - Synaptics report rate should be lowered to 40pps
      (from 80), otherwise KBC starts losing keypresses.
      Signed-off-by: default avatarRichard Thrippleton <ret28@cam.ac.uk>
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
      53a2670c
    • Raphael Assenat's avatar
      Input: gamecon - add SNES mouse support · b157d55e
      Raphael Assenat authored
      SNES gamepads and mice share the same type of interface so they both can be
      connected to the parallel port using a simple interface.  Adding mouse
      support to a gamepad driver may sound funny at first, but doing so in this
      case makes it possible to connect and SNES gamepads and mice at the same
      time, on the same port.
      Signed-off-by: default avatarRaphael Assenat <raph@raphnet.net>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
      b157d55e
    • Dmitry Torokhov's avatar
      ac648a6a
    • Dmitry Torokhov's avatar
      Input: convert /proc handling to seq_file · 969b21cd
      Dmitry Torokhov authored
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
      969b21cd
    • Dmitry Torokhov's avatar
      Input: limit attributes' output to PAGE_SIZE · 2db66876
      Dmitry Torokhov authored
      sysfs can't handle more than PAGE_SIZE data coming from attributes'
      show() methods; make sure we respect this limit.
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
      2db66876
    • Dmitry Torokhov's avatar
      Manual merge with Linus. · 95d465fd
      Dmitry Torokhov authored
      Conflicts:
      	arch/powerpc/kernel/setup-common.c
      	drivers/input/keyboard/hil_kbd.c
      	drivers/input/mouse/hil_ptr.c
      95d465fd
  2. 01 Apr, 2006 27 commits