1. 12 5月, 2007 3 次提交
    • L
      Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid · 5884c406
      Linus Torvalds 提交于
      * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
        USB HID: hiddev - fix race between hiddev_send_event() and hiddev_release()
        HID: add hooks for getkeycode() and setkeycode() methods
        HID: switch to using input_dev->dev.parent
        USB HID: Logitech wheel 0x046d/0xc294 needs HID_QUIRK_NOGET quirk
        USB HID: usb_buffer_free() cleanup
        USB HID: report descriptor of Cypress USB barcode readers needs fixup
        Bluetooth HID: HIDP - don't initialize force feedback
        USB HID: update CONFIG_USB_HIDINPUT_POWERBOOK description
        HID: add input mappings for non-working keys on Logitech S510 remote
      5884c406
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · ee54d2d8
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (31 commits)
        [NETFILTER]: xt_conntrack: add compat support
        [NETFILTER]: iptable_raw: ignore short packets sent by SOCK_RAW sockets
        [NETFILTER]: iptable_{filter,mangle}: more descriptive "happy cracking" message
        [NETFILTER]: nf_nat: Clears helper private area when NATing
        [NETFILTER]: ctnetlink: clear helper area and handle unchanged helper
        [NETFILTER]: nf_conntrack: Removes unused destroy operation of l3proto
        [NETFILTER]: nf_conntrack: Removes duplicated declarations
        [NETFILTER]: nf_nat: remove unused argument of function allocating binding
        [NETFILTER]: Clean up table initialization
        [NET_SCHED]: Avoid requeue warning on dev_deactivate
        [NET_SCHED]: Reread dev->qdisc for NETDEV_TX_OK
        [NET_SCHED]: Rationalise return value of qdisc_restart
        [NET]: Fix dev->qdisc race for NETDEV_TX_LOCKED case
        [UDP]: Fix AF-specific references in AF-agnostic code.
        [IrDA]: KingSun/DonShine USB IrDA dongle support.
        [IPV6] ROUTE: Assign rt6i_idev for ip6_{prohibit,blk_hole}_entry.
        [IPV6]: Do no rely on skb->dst before it is assigned.
        [IPV6]: Send ICMPv6 error on scope violations.
        [SCTP]: Do not include ABORT chunk header in the notification.
        [SCTP]: Correctly copy addresses in sctp_copy_laddrs
        ...
      ee54d2d8
    • K
      Input: evdev - fix overflow in compat_ioctl · bf61f8d3
      Kenichi Nagai 提交于
      When exporting input device bitmaps via compat_ioctl on BIG_ENDIAN
      platforms evdev calculates data size incorrectly. This causes buffer
      overflow if user specifies buffer smaller than maxlen.
      Signed-off-by: NKenichi Nagai <kenichi3.nagai@toshiba.co.jp>
      Signed-off-by: NDmitry Torokhov <dtor@mail.ru>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bf61f8d3
  2. 11 5月, 2007 37 次提交