1. 03 Apr, 2010 6 commits
  2. 02 Apr, 2010 27 commits
  3. 01 Apr, 2010 7 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 42be79e3
      Linus Torvalds authored
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (76 commits)
        drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus.
        drm/radeon/kms: rs400/480 should set common registers.
        drm/radeon/kms: add sanity check to wptr.
        drm/radeon/kms/evergreen: get DP working
        drm/radeon/kms: add hw_i2c module option
        drm/radeon/kms: use new pre/post_xfer i2c bit algo hooks
        drm/radeon/kms: disable MSI on IGP chips
        drm/radeon/kms: display watermark updates (v2)
        drm/radeon/kms/dp: disable training pattern on the sink at the end of link training
        drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2)
        drm/radeon/kms/dp: remove extraneous training complete call
        drm/radeon/kms/atom: minor fixes to transmitter setup
        drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM.
        drm: fix build error when SYSRQ is disabled
        drm/radeon/kms: fix macbookpro connector quirk
        drm/radeon/r6xx/r7xx: further safe reg clean up
        drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support
        drm/radeon/kms: bump the version for r6xx/r7xx const buffer support
        drm/radeon/r6xx/r7xx: CS parser fixes
        drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup
        ...
      
      Fix up MSI-related conflicts in drivers/gpu/drm/radeon/radeon_irq_kms.c
      42be79e3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze · 445c682b
      Linus Torvalds authored
      * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (35 commits)
        microblaze: Support word copying in copy_tofrom_user
        microblaze: Print early printk information to log buffer
        microblaze: head.S typo fix
        microblaze: Use MICROBLAZE_TLB_SIZE in asm code
        microblaze: Kconfig Fix - pci
        microblaze: Adding likely macros
        microblaze: Add .type and .size to ASM functions
        microblaze: Fix TLB macros
        microblaze: Use instruction with delay slot
        microblaze: Remove additional resr and rear loading
        microblaze: Change register usage for ESR and EAR
        microblaze: Prepare work for optimization in exception code
        microblaze: Add DEBUG option
        microblaze: Support systems without lmb bram
        microblaze: uaccess: Sync strlen, strnlen, copy_to/from_user
        microblaze: uaccess: Unify __copy_tofrom_user
        microblaze: uaccess: Move functions to generic location
        microblaze: uaccess: Fix put_user for noMMU
        microblaze: uaccess: Fix get_user macro for noMMU
        microblaze: uaccess: fix clear_user for noMMU kernel
        ...
      445c682b
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of... · c7681f46
      Linus Torvalds authored
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
        eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptops
        asus-laptop: fix warning in asus_handle_init
      c7681f46
    • Oleg Nesterov's avatar
      oom: fix the unsafe usage of badness() in proc_oom_score() · b95c35e7
      Oleg Nesterov authored
      proc_oom_score(task) has a reference to task_struct, but that is all.
      If this task was already released before we take tasklist_lock
      
      	- we can't use task->group_leader, it points to nowhere
      
      	- it is not safe to call badness() even if this task is
      	  ->group_leader, has_intersects_mems_allowed() assumes
      	  it is safe to iterate over ->thread_group list.
      
      	- even worse, badness() can hit ->signal == NULL
      
      Add the pid_alive() check to ensure __unhash_process() was not called.
      
      Also, use "task" instead of task->group_leader. badness() should return
      the same result for any sub-thread. Currently this is not true, but
      this should be changed anyway.
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b95c35e7
    • Michal Simek's avatar
      microblaze: Support word copying in copy_tofrom_user · ca3865ba
      Michal Simek authored
      Word copying is used only for aligned addresses.
      Here is space for improving to use any better copying technique.
      Look at memcpy implementation.
      Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
      ca3865ba
    • Michal Simek's avatar
      microblaze: Print early printk information to log buffer · 6059b3cb
      Michal Simek authored
      If early printk console is not enabled then all messages
      are written to log buffer.
      Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
      6059b3cb
    • Michal Simek's avatar
      microblaze: head.S typo fix · 3f218935
      Michal Simek authored
      I forget to change register name in comments.
      Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
      3f218935