1. 15 1月, 2010 3 次提交
    • M
      alpha: add myself as a maintainer, and drop mention of 2.4 · abd4d609
      Matt Turner 提交于
      CC: Richard Henderson <rth@twiddle.net>
      CC: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      CC: linux-alpha@vger.kernel.org
      Signed-off-by: NMatt Turner <mattst88@gmail.com>
      abd4d609
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 61c39bb3
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] tape_char: add missing compat_ptr conversion
        [S390] zcrypt: add sanity check before copy_from_user()
        [S390] unwire sys_recvmmsg again
        [S390] con3215: remove empty ioctl function
        [S390] dasd: add proper compat pointer conversion for symmetrix ioctl
        [S390] mmap: add missing compat_ptr conversion to both mmap compat syscalls
        [S390] bug: implement arch specific __WARN macro
        [S390] Move __cpu_logical_map to smp.c
        [S390] tape_block: remove ioctl function
        [S390] smp: remove volatile type quilifier from __cpu_logical_map
        [S390] smp: setup smp_processor_id early
        [S390] use helpers for rlimits
        [S390] fs3270: add missing compat ptr conversion
        [S390] vmcp: add missing compat ptr conversion
        [S390] cio: add missing compat ptr conversion
        [S390] dasd: add missing compat ptr conversion
        [S390] remove superfluous TIF_USEDFPU bit
        [S390] duplicate SIGTRAP on signal delivery.
        [S390] clear TIF_SINGLE_STEP for new process.
        [S390] fix loading of PER control registers for utrace.
      61c39bb3
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 4a24eef6
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)
        net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n
        ipv6: skb_dst() can be NULL in ipv6_hop_jumbo().
        tg3: Update copyright and driver version
        tg3: Disable 5717 serdes and B0 support
        tg3: Add reliable serdes detection for 5717 A0
        tg3: Fix std rx prod ring handling
        tg3: Fix std prod ring nicaddr for 5787 and 57765
        sfc: Fix conditions for MDIO self-test
        sfc: Fix polling for slow MCDI operations
        e1000e: workaround link issues on busy hub in half duplex on 82577/82578
        e1000e: MDIO slow mode should always be done for 82577
        ixgbe: update copyright dates
        ixgbe: Do not attempt to perform interrupts in netpoll when down
        cfg80211: fix refcount imbalance when wext is disabled
        mac80211: fix queue selection for data frames on monitor interfaces
        iwlwifi: silence buffer overflow warning
        iwlwifi: disable tx on beacon update notification
        iwlwifi: fix iwl_queue_used bug when read_ptr == write_ptr
        mac80211: fix endian error
        mac80211: add missing sanity checks for action frames
        ...
      4a24eef6
  2. 14 1月, 2010 37 次提交