1. 03 5月, 2007 21 次提交
  2. 01 5月, 2007 11 次提交
  3. 30 4月, 2007 8 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 40caf5ea
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (56 commits)
        ieee1394: remove garbage from Kconfig
        ieee1394: more help in Kconfig
        ieee1394: ohci1394: Fix mistake in printk message.
        ieee1394: ohci1394: remove unnecessary rcvPhyPkt bit flipping in LinkControl register
        ieee1394: ohci1394: fix cosmetic problem in error logging
        ieee1394: eth1394: send async streams at S100 on 1394b buses
        ieee1394: eth1394: fix error path in module_init
        ieee1394: eth1394: correct return codes in hard_start_xmit
        ieee1394: eth1394: hard_start_xmit is called in atomic context
        ieee1394: eth1394: some conditions are unlikely
        ieee1394: eth1394: clean up fragment_overlap
        ieee1394: eth1394: don't use alloc_etherdev
        ieee1394: eth1394: omit useless set_mac_address callback
        ieee1394: eth1394: CONFIG_INET is always defined
        ieee1394: eth1394: allow MTU bigger than 1500
        ieee1394: unexport highlevel_host_reset
        ieee1394: eth1394: contain host reset
        ieee1394: eth1394: shorter error messages
        ieee1394: eth1394: correct a memset argument
        ieee1394: eth1394: refactor .probe and .update
        ...
      40caf5ea
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid · d6454706
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: (21 commits)
        USB HID: don't warn on idVendor == 0
        USB HID: add 'quirks' module parameter
        USB HID: add support for dynamically-created quirks
        USB HID: clarify static quirk handling as squirks
        USB HID: encapsulate quirk handling into hid-quirks.c
        USB HID: EMS USBII device needs HID_QUIRK_MULTI_INPUT
        HID: update copyright and authorship macro
        HID: introduce proper zeroing of unused bits in output reports
        USB HID: add support for WiseGroup MP-8800 Quad Joypad
        USB HID: add FF support for Logitech Force 3D Pro Joystick
        USB HID: numlock quirk for dell W7658 keyboard
        USB HID: Logitech MX3000 keyboard needs report descriptor quirk
        USB HID: extend quirk for Logitech S510 keyboard
        USB HID: usbkbd/usbmouse - handle errors when registering devices
        USB HID: add QUIRK_HIDDEV for Belkin Flip KVM
        HID: enable dead keys on a belkin wireless keyboard
        USB HID: Thustmaster firestorm dual power v1 support
        USB HID: specify explicit size for hid_blacklist.quirks
        USB HID: fix retry & reset logic
        USB HID: consolidate vendor/product ids
        ...
      d6454706
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 152a6a9d
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
        [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts
        [IPV4] SNMP: Support InMcastPkts and InBcastPkts
        [IPV4] SNMP: Support InTruncatedPkts
        [IPV4] SNMP: Support InNoRoutes
        [SNMP]: Add definitions for {In,Out}BcastPkts
        [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent
        [TCP] FRTO: Delay skb available check until it's mandatory
        [XFRM]: Restrict upper layer information by bundle.
        [TCP]: Catch skb with S+L bugs earlier
        [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo
        [L2TP]: Add the ability to autoload a pppox protocol module.
        [SKB]: Introduce skb_queue_walk_safe()
        [AF_IUCV/IUCV]: smp_call_function deadlock
        [IPV6]: Fix slab corruption running ip6sic
        [TCP]: Update references in two old comments
        [XFRM]: Export SPD info
        [IPV6]: Track device renames in snmp6.
        [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage.
        [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.
        [NETPOLL]: Remove CONFIG_NETPOLL_RX
        ...
      152a6a9d
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block · cd9bb7e7
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
        [PATCH] elevator: elv_list_lock does not need irq disabling
        [BLOCK] Don't pin lots of memory in mempools
        cfq-iosched: speedup cic rb lookup
        ll_rw_blk: add io_context private pointer
        cfq-iosched: get rid of cfqq hash
        cfq-iosched: tighten queue request overlap condition
        cfq-iosched: improve sync vs async workloads
        cfq-iosched: never allow an async queue idling
        cfq-iosched: get rid of ->dispatch_slice
        cfq-iosched: don't pass unused preemption variable around
        cfq-iosched: get rid of ->cur_rr and ->cfq_list
        cfq-iosched: slice offset should take ioprio into account
        [PATCH] cfq-iosched: style cleanups and comments
        cfq-iosched: sort IDLE queues into the rbtree
        cfq-iosched: sort RT queues into the rbtree
        [PATCH] cfq-iosched: speed up rbtree handling
        cfq-iosched: rework the whole round-robin list concept
        cfq-iosched: minor updates
        cfq-iosched: development update
        cfq-iosched: improve preemption for cooperating tasks
      cd9bb7e7
    • L
      Merge branch 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 24a77daf
      Linus Torvalds 提交于
      * 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (255 commits)
        [POWERPC] Remove dev_dbg redefinition in drivers/ps3/vuart.c
        [POWERPC] remove kernel module option for booke wdt
        [POWERPC] Avoid putting cpu node twice
        [POWERPC] Spinlock initializer cleanup
        [POWERPC] ppc4xx_sgdma needs dma-mapping.h
        [POWERPC] arch/powerpc/sysdev/timer.c build fix
        [POWERPC] get_property cleanups
        [POWERPC] Remove the unused HTDMSOUND driver
        [POWERPC] cell: cbe_cpufreq cleanup and crash fix
        [POWERPC] Declare enable_kernel_spe in a header
        [POWERPC] Add dt_xlate_addr() to bootwrapper
        [POWERPC] bootwrapper: CONFIG_ -> CONFIG_DEVICE_TREE
        [POWERPC] Don't define a custom bd_t for Xilixn Virtex based boards.
        [POWERPC] Add sane defaults for Xilinx EDK generated xparameters files
        [POWERPC] Add uartlite boot console driver for the zImage wrapper
        [POWERPC] Stop using ppc_sys for Xilinx Virtex boards
        [POWERPC] New registration for common Xilinx Virtex ppc405 platform devices
        [POWERPC] Merge common virtex header files
        [POWERPC] Rework Kconfig dependancies for Xilinx Virtex ppc405 platform
        [POWERPC] Clean up cpufreq Kconfig dependencies
        ...
      24a77daf
    • M
      [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts · 80787ebc
      Mitsuru Chinen 提交于
      A transmitted IP multicast datagram should be counted as OutMcastPkts.
      By the same token, a transmitted IP broadcast datagram should be
      counted as OutBcastPkts.
      Signed-off-by: NMitsuru Chinen <mitch@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      80787ebc
    • M
      [IPV4] SNMP: Support InMcastPkts and InBcastPkts · 5506b54b
      Mitsuru Chinen 提交于
      A received IP multicast datagram should be counted as InMcastPkts.
      By the same token, a received IP broadcast datagram should be
      counted as InBcastPkts.
      Signed-off-by: NMitsuru Chinen <mitch@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5506b54b
    • M
      [IPV4] SNMP: Support InTruncatedPkts · 704aed53
      Mitsuru Chinen 提交于
      An IP datagram which is being discarded because the datagram frame
      didn't carry enough data should be counted as InTruncatedPkts.
      Signed-off-by: NMitsuru Chinen <mitch@linux.vnet.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      704aed53