From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Feb 2011 22:05:24 +0000 (-0800)
Subject: Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~7613^2~2487
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b8f049ae5593255e42179baa0ce726ae7fdfb30a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'omap-fixes-for-linus' of git://git./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:
  arm: omap4: panda: remove usb_nop_xceiv_register(v1)
  OMAP1: Fix non-working LCD on OMAP310
  OMAP3: Devkit8000: Change lcd power pin
  omap1: remove duplicated #include
  arm: mach-omap2: mux: free allocated memory on error exit
  arm: mach-omap2: board-rm680: fix rm680_vemmc regulator constraints
  OMAP: PM: SmartReflex: Fix possible null pointer read access
  OMAP: PM: SmartReflex: Fix possible memory leak
  arm: mach-omap2: voltage: debugfs: fix memory leak
  OMAP3: PM: fix save secure RAM to restore MPU power state
  OMAP: PM: SmartReflex: Add missing IS_ERR test
---

b8f049ae5593255e42179baa0ce726ae7fdfb30a