1. 01 10月, 2009 10 次提交
  2. 30 9月, 2009 7 次提交
    • L
      Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 9c1fe834
      Linus Torvalds 提交于
      * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM / yenta: Fix cardbus suspend/resume regression
        PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()
      9c1fe834
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 5a4c8d75
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
        sony-laptop: re-read the rfkill state when resuming from suspend
        sony-laptop: check for rfkill hard block at load time
        wext: add back wireless/ dir in sysfs for cfg80211 interfaces
        wext: Add bound checks for copy_from_user
        mac80211: improve/fix mlme messages
        cfg80211: always get BSS
        iwlwifi: fix 3945 ucode info retrieval after failure
        iwlwifi: fix memory leak in command queue handling
        iwlwifi: fix debugfs buffer handling
        cfg80211: don't set privacy w/o key
        cfg80211: wext: don't display BSSID unless associated
        net: Add explicit bound checks in net/socket.c
        bridge: Fix double-free in br_add_if.
        isdn: fix netjet/isdnhdlc build errors
        atm: dereference of he_dev->rbps_virt in he_init_group()
        ax25: Add missing dev_put in ax25_setsockopt
        Revert "sit: stateless autoconf for isatap"
        net: fix double skb free in dcbnl
        net: fix nlmsg len size for skb when error bit is set.
        net: fix vlan_get_size to include vlan_flags size
        ...
      5a4c8d75
    • L
      Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · e15daf6c
      Linus Torvalds 提交于
      * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (25 commits)
        drm/radeon/kms: Convert R520 to new init path and associated cleanup
        drm/radeon/kms: Convert RV515 to new init path and associated cleanup
        drm: fix radeon DRM warnings when !CONFIG_DEBUG_FS
        drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQ
        drm/r600: fix memory leak introduced with 64k malloc avoidance fix.
        drm/kms: make fb helper work for all drivers.
        drm/radeon/r600: fix offset handling in CS parser
        drm/radeon/kms/r600: fix forcing pci mode on agp cards
        drm/radeon/kms: fix for the extra pages copying.
        drm/radeon/kms/r600: add support for vline relocs
        drm/radeon/kms: fix some bugs in vline reloc
        drm/radeon/kms/r600: clamp vram to aperture size
        drm/kms: protect against fb helper not being created.
        drm/r600: get values from the passed in IB not the copy.
        drm: create gitignore file for radeon
        drm/radeon/kms: remove unneeded master create/destroy functions.
        drm/kms: start adding command line interface using fb.
        fb: change rules for global rules match.
        drm/radeon/kms: don't require up to 64k allocations. (v2)
        drm/radeon/kms: enable dac load detection by default.
        ...
      
      Trivial conflicts in drivers/gpu/drm/radeon/radeon_asic.h due to adding
      '->vga_set_state' function pointers.
      e15daf6c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 07892acf
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: make allocation failures more verbose
        percpu: make pcpu_setup_first_chunk() failures more verbose
        percpu: make embedding first chunk allocator check vmalloc space size
        sparc64: implement page mapping percpu first chunk allocator
        percpu: make pcpu_build_alloc_info() clear static buffers
        percpu: fix unit_map[] verification in pcpu_setup_first_chunk()
      07892acf
    • L
      Merge branch 'omap-fixes-for-linus' of... · 8c11499a
      Linus Torvalds 提交于
      Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
        omap: Fix wrong condition check in while loop for mailbox and iommu2
        omap: rng: Use resource_size instead of manual calculation
        omap: Fix MMC gpio_wp for BeagleBoard C2 and above
        omap: Fix matrix_keymap_data usage
        omap: Fix a OMAP_MPUIO_VBASE typo for 850
        omap: Fix wrong jtag_id for 850
        omap: iovmm: Fix compiler warning
        omap: mailbox: Flush posted write when acking mailbox irq
        omap: mailbox: Execute softreset at startup
        omap: Add missing mux pin for EHCI phy reset line
        omap: Fix 44xx compile
        omap: Fix mcspi compile for 2420
        omap: Fix compile for arch/arm/mach-omap2
      8c11499a
    • L
      pty: reconnect the BSD TIOCSPTLCK handling to legacy ptys · 342a5971
      Linus Torvalds 提交于
      David Howells noticed (due to the compiler warning about an unused
      'pty_ops_bsd' variable) that we haven't actually been using the code
      that implements TIOCSPTLCK for legacy pty handling.  It's been that way
      since 2.6.26, commit 3e8e88ca to be
      exact ("pty: prepare for tty->ops changes").
      
      DavidH initially submitted a patch just removing the dead code entirely,
      and since nobody has apparently ever complained, I'm not entirely sure
      that wouldn't be the right thing to do.  But since the whole and only
      point of the legacy pty code is to be compatible with legacy distros
      that don't use the new unix98 pty model, let's just wire it up again.
      
      And clean it up a bit while we're at it.
      Acked-by: NDavid Howells <dhowells@redhat.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      342a5971
    • L
      Revert "x86, mce: do not compile mcelog message on AMD" · e207e143
      Linus Torvalds 提交于
      This reverts commit 22223c9b, as
      requested by Andi Kleen:
      
        "Obviously kernels compiled with AMD support can still run on non AMD
         systems, so messages like this can never be removed at compile time."
      Requsted-by: NAndi Kleen <andi@firstfloor.org>
      Cc: Borislav Petkov <borislav.petkov@amd.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e207e143
  3. 29 9月, 2009 23 次提交