tree a86cbf70b48112bf00933fddc123d147a2de4275
parent ad4a4a82d176962ea706db555b29821af0b4dd45
parent 077f8ec889bb1eb26a7128fdbc75922755ed2320
author Linus Torvalds <torvalds@linux-foundation.org> 1299532502 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1299532502 -0800

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:
  omap: mailbox: resolve hang issue
  OMAP2+: PM: SmartReflex: fix memory leaks in Smartreflex driver
  arm: mach-omap2: smartreflex: fix another memory leak