1. 23 May, 2011 5 commits
  2. 22 May, 2011 7 commits
  3. 20 May, 2011 22 commits
  4. 19 May, 2011 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 51509a28
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (34 commits)
        PM: Introduce generic prepare and complete callbacks for subsystems
        PM: Allow drivers to allocate memory from .prepare() callbacks safely
        PM: Remove CONFIG_PM_VERBOSE
        Revert "PM / Hibernate: Reduce autotuned default image size"
        PM / Hibernate: Add sysfs knob to control size of memory for drivers
        PM / Wakeup: Remove useless synchronize_rcu() call
        kmod: always provide usermodehelper_disable()
        PM / ACPI: Remove acpi_sleep=s4_nonvs
        PM / Wakeup: Fix build warning related to the "wakeup" sysfs file
        PM: Print a warning if firmware is requested when tasks are frozen
        PM / Runtime: Rework runtime PM handling during driver removal
        Freezer: Use SMP barriers
        PM / Suspend: Do not ignore error codes returned by suspend_enter()
        PM: Fix build issue in clock_ops.c for CONFIG_PM_RUNTIME unset
        PM: Revert "driver core: platform_bus: allow runtime override of dev_pm_ops"
        OMAP1 / PM: Use generic clock manipulation routines for runtime PM
        PM: Remove sysdev suspend, resume and shutdown operations
        PM / PowerPC: Use struct syscore_ops instead of sysdevs for PM
        PM / UNICORE32: Use struct syscore_ops instead of sysdevs for PM
        PM / AVR32: Use struct syscore_ops instead of sysdevs for PM
        ...
      51509a28
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 75f5076b
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/qib: Use pci_dev->revision
        RDMA/iwcm: Get rid of enum iw_cm_event_status
        IB/ipath: Use pci_dev->revision, again
        IB/qib: Prevent driver hang with unprogrammed boards
        RDMA/cxgb4: EEH errors can hang the driver
        RDMA/cxgb4: Reset wait condition atomically
        RDMA/cxgb4: Fix missing parentheses
        RDMA/cxgb4: Initialization errors can cause crash
        RDMA/cxgb4: Don't change QP state outside EP lock
        RDMA/cma: Add an ID_REUSEADDR option
        RDMA/cma: Fix handling of IPv6 addressing in cma_use_port
      75f5076b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm · 83d7e948
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm:
        kmemleak: Initialise kmemleak after debug_objects_mem_init()
        kmemleak: Select DEBUG_FS unconditionally in DEBUG_KMEMLEAK
        kmemleak: Do not return a pointer to an object that kmemleak did not get
      83d7e948
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus · fce4a1dd
      Linus Torvalds authored
      * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (48 commits)
        MIPS: Move arch_get_unmapped_area and gang to new file.
        MIPS: Cleanup arch_get_unmapped_area
        MIPS: Octeon: Don't request interrupts for unused IPI mailbox bits.
        Octeon: Fix interrupt irq settings for performance counters.
        MIPS: Fix build warnings on defconfigs
        MIPS: Lemote 2F, Malta: Fix build warning
        MIPS: Set ELF AT_PLATFORM string for Loongson2 processors
        MIPS: Set ELF AT_PLATFORM string for BMIPS processors
        MIPS: Introduce set_elf_platform() helper function
        MIPS: JZ4740: setup: Autodetect physical memory.
        MIPS: BCM47xx: Fix MAC address parsing.
        MIPS: BCM47xx: Extend the filling of SPROM from NVRAM
        MIPS: BCM47xx: Register SSB fallback sprom callback
        MIPS: BCM47xx: Extend bcm47xx_fill_sprom with prefix.
        SSB: Change fallback sprom to callback mechanism.
        MIPS: Alchemy: Clean up GPIO registers and accessors
        MIPS: Alchemy: Cleanup DMA addresses
        MIPS: Alchemy: Rewrite ethernet platform setup
        MIPS: Alchemy: Rewrite UART setup and constants.
        MIPS: Alchemy: Convert dbdma.c to syscore_ops
        ...
      fce4a1dd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · e1f2084e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        input/atari: Fix mouse movement and button mapping
        input/atari: Fix atarimouse init
        input/atari: Use the correct mouse interrupt hook
        m68k/atari: Do not use "/" in interrupt names
        m68k: unistd - Comment out definitions for unimplemented syscalls
        m68k: Really wire up sys_pselect6 and sys_ppoll
        m68k: Merge mmu and non-mmu versions of sys_call_table
        MAINTAINERS: Roman Zippel has been MIA for several years.
        m68k: bitops - Never step beyond the end of the bitmap
        m68k: bitops - offset == ((long)p - (long)vaddr) * 8
      e1f2084e
    • Ingo Molnar's avatar
      core_kernel_data(): Fix architectures that do not define _sdata · c5fc4721
      Ingo Molnar authored
      Some architectures such as Alpha do not define _sdata but _data:
      
        kernel/built-in.o: In function `core_kernel_data':
        kernel/extable.c:77: undefined reference to `_sdata'
      
      So expand the scope of the data range to the text addresses too,
      this might be more correct anyway because this way we can
      cover readonly variables as well.
      
      Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Link: http://lkml.kernel.org/n/tip-i878c8a0e0g0ep4v7i6vxnhz@git.kernel.org
      
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      c5fc4721