From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Dec 2010 01:36:35 +0000 (-0800)
Subject: Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.37-rc6~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ec5d043f2809b9aaf14e6676ddb0dc8c3a6dc8de;p=~emulex%2Finfiniband.git

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:
  OMAP2: PRCM: fix some SHIFT macros that were actually bitmasks
  OMAP2+: PM/serial: fix console semaphore acquire during suspend
  OMAP1: SRAM: fix size for OMAP1611 SoCs
  arm: omap2: io: fix clk_get() error check
  arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check
  omap: nand: remove hardware ECC as default
  omap: zoom: wl1271 slot is MMC_CAP_POWER_OFF_CARD
  omap: PM debug: fix wake-on-timer debugfs dependency
---

ec5d043f2809b9aaf14e6676ddb0dc8c3a6dc8de