commit 3643e0e87c13c670a0fdcd0c34401b38b36ff021
Merge: e983dc2 cc6455f
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 30 12:09:26 2010 -0800

    Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel
    
    * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
      drm/i915/dvo: Report LVDS attached to ch701x as connected
      Revert "drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks"
      drm/i915: Verify Ironlake eDP presence on DP_A using the capability fuse
      drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915.
      drm/i915/sdvo: Add hdmi connector properties after initing the connector
      drm/i915: Set the required VFMUNIT clock gating disable on Ironlake.

commit e983dc2428164698571e1dd1b25c4322181adbac
Author: Nitin Gupta <ngupta@vflare.org>
Date:   Thu Dec 30 04:07:58 2010 -0500

    Revert "Staging: zram: work around oops due to startup ordering snafu"
    
    This reverts commit 7e24cce38a99f373450db67bf576fe73e8168d66 because it
    was never appropriate for mainline.
    
    Do not check for init flag before starting I/O - zram module is unusable
    without this fix.
    
    The oops mentioned in the reverted commit message was actually a problem
    only with the zram version as present in project's own repository where
    we allocate struct zram_stats_cpu upon device initialization.  OTOH, In
    mainline/staging version of zram, we allocate struct stats upfront, so
    this oops cannot happen in mainline version.
    
    Checking for init_done flag in zram_make_request() results in a *no-op*
    for any I/O operation since we simply always return success.  This flag
    is actually set when the first write occurs on a zram disk which
    triggers its initialization.
    
    Bug report: https://bugzilla.kernel.org/show_bug.cgi?id=25722
    
    Reported-by: Dennis Jansen <dennis.jansen@web.de>
    Signed-off-by: Nitin Gupta <ngupta@vflare.org>
    Cc: Anton Blanchard <anton@samba.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ff20f1779b7f60a9682aa8d62f8ca3b650e4c360
Merge: ebb76ce 0bc4634
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 30 10:07:44 2010 -0800

    Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6
    
    * 'merge-spi' of git://git.secretlab.ca/git/linux-2.6:
      spi/m68knommu: Coldfire QSPI platform support
      spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode transition

commit ebb76ce16daf6908dc030dec1c00827d37129fe5
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date:   Wed Dec 29 14:07:11 2010 -0800

    memcg: fix wrong VM_BUG_ON() in try_charge()'s mm->owner check
    
    At __mem_cgroup_try_charge(), VM_BUG_ON(!mm->owner) is checked.
    But as commented in mem_cgroup_from_task(), mm->owner can be NULL
    in some racy case. This check of VM_BUG_ON() is bad.
    
    A possible story to hit this is at swapoff()->try_to_unuse(). It passes
    mm_struct to mem_cgroup_try_charge_swapin() while mm->owner is NULL. If we
    can't get proper mem_cgroup from swap_cgroup information, mm->owner is used
    as charge target and we see NULL.
    
    Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Reported-by: Hugh Dickins <hughd@google.com>
    Reported-by: Thomas Meyer <thomas@m3y3r.de>
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Reviewed-by: Balbir Singh <balbir@linux.vnet.ibm.com>
    Signed-off-by: Hugh Dickins <hughd@google.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b83be6f20a0e468f715b14225c9f897538dfe5ad
Author: Christoph Hellwig <hch>
Date:   Thu Dec 16 12:04:54 2010 +0100

    update Documentation/filesystems/Locking
    
    Mostly inspired by all the recent BKL removal changes, but a lot of older
    updates also weren't properly recorded.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cc6455f82edd3f9da3b03870d41cde3cb22ad40d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Dec 30 12:54:00 2010 +0000

    drm/i915/dvo: Report LVDS attached to ch701x as connected
    
    As we have already detected something attached to the chip during
    initialisation, always report the LVDS connector status as connected
    during probing.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

commit bcfbbce822d219eb587acaba8a6e062bbeae4761
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Dec 30 09:07:15 2010 +0000

    Revert "drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks"
    
    As I feared, whilst this fixed the clocks for the Lenovo U160, it broke
    many other machines. So lets reverts commit 448f53a1ede54eb854d036abf
    and search for the real bug.
    
    Reported-and-tested-by: Travis Hume <travis@computoring.org> [et al]
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=25842
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32698
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

commit 0bc463426ab5eb39e76df637b29a4f191d01b8a0
Author: Jate Sujjavanich <jsujjavanich@syntech-fuelmaster.com>
Date:   Wed Sep 29 09:44:32 2010 -0400

    spi/m68knommu: Coldfire QSPI platform support
    
    After grabbing a msg from the msgq, the mcfqspi_work function calls
    list_del_init on the mcfqspi->msgq which unintentionally deletes the rest
    of the list before it can be processed. If qspi call was made using
    spi_sync, this can result in a process hang.
    
    Signed-off-by: Jate Sujjavanich <jsujjavanich@syntech-fuelmaster.com>
    Acked-by: Steven King <sfking@fdwdc.com>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

commit 42ce7fd6319bed8ecb26d656c476365da46b29e9
Author: Gregory CLEMENT <gregory.clement@free-electrons.com>
Date:   Wed Dec 29 11:52:53 2010 +0100

    spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode transition
    
    When SPI wake up from OFF mode, CS is in the wrong state: force it to the
    inactive state.
    
    During the system life, I monitored the CS behavior using a oscilloscope.
    I also activated debug in omap2_mcspi, so I saw when driver disable the clocks
    and restore context when device is not used.Each time the CS was in the correct
    state.  It was only when system was put suspend to ram with off-mode activated
    that on resume the CS was in wrong state( ie activated).
    
    Changelog:
    * Change from v1 to v2:
      - Rebase on linus/master (after 2.6.37-rc1)
      - Do some clean-up and fix indentation on both patches
      - Add more explanations for patch 2
    
    * Change from v2 to v3:
      - Use directly resume function of spi_master instead of using function
      - from spi_device as Grant Likely pointed it out.
      - Force this transition explicitly for each CS used by a device.
    
    * Change from v3 to v4:
      - Patch clean-up according to Kevin Hilman and checkpatch.
      - Now force CS to be in inactive state only if it was inactive when it was
        suspended.
    
    * Change from v4 to v5:
      - Rebase on linus/master (after 2.6.37-rc3)
      - Collapse some lines as pointed by Grant Likely
      - Fix a spelling
    
    * Change from v5 to v6:
      - Rebase on linus/master (after 2.6.37-rc7)
      - Use CONFIG_SUSPEND instead of CONFIG_PM
      - Didn't use legacy PM methods anymore. Instead, add a struct dev_pm_ops and
        add the resume method there.
      - Fix multi-line comment style
    
    * Change from v6 to v7:
      - Rebase on linus/master (after 2.6.37-rc8)
      - Drop an extra line
    
    Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

commit 4ef9e11d6867f88951e30db910fa015300e31871
Author: Hillf Danton <dhillf@gmail.com>
Date:   Wed Dec 29 21:55:28 2010 +0800

    fix freeing user_struct in user cache
    
    When racing on adding into user cache, the new allocated from mm slab
    is freed without putting user namespace.
    
    Since the user namespace is already operated by getting, putting has
    to be issued.
    
    Signed-off-by: Hillf Danton <dhillf@gmail.com>
    Acked-by: Serge Hallyn <serge@hallyn.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4d3024428f5c3ef5295e6f6fb257ae118b3f93a1
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue Dec 14 19:21:29 2010 +0000

    drm/i915: Verify Ironlake eDP presence on DP_A using the capability fuse
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

commit 63ee41d794d9c555f84205517a68509848988760
Author: Eric Anholt <eric@anholt.net>
Date:   Mon Dec 20 18:40:06 2010 -0800

    drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915.
    
    The IPS driver is designed to be able to run detached from i915 and
    just not enable GPU turbo in that case, in order to avoid module
    dependencies between the two drivers.  This means that we don't know
    what the load order between the two is going to be, and we had
    previously only supported IPS after (optionally) i915, but not i915
    after IPS.  If the wrong order was chosen, you'd get no GPU turbo, and
    something like half the possible graphics performance.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: stable@kernel.org

commit f797d22121404eac7b63f1291409f96bcab51c11
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Dec 23 09:43:48 2010 +0000

    drm/i915/sdvo: Add hdmi connector properties after initing the connector
    
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=25012
    Reported-by: Tõnu Raitviir <jussuf@linux.ee>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

commit 06f37751af77192b424b2b0ff17dc08de65faba0
Author: Eric Anholt <eric@anholt.net>
Date:   Tue Dec 14 10:06:46 2010 -0800

    drm/i915: Set the required VFMUNIT clock gating disable on Ironlake.
    
    It's required by the specs, but we don't know why.  Let's not find out
    why.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>