Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Nov 2009 23:00:21 +0000 (15:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Nov 2009 23:00:21 +0000 (15:00 -0800)
commitd22966d0673290bc43383fb9613621ef5ec9de5e
treeca8d78134d7b12f67960839eb5860ac7ff7b5224
parent70b172b2989685a16cb47224678b9290d73fcd18
parente7fdc6052e78738ce90e0bdc051f2ddf60e41324
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:
  OMAP: cs should be positive in gpmc_cs_free()
  omap: fix unlikely(x) < y
  omap3: clock: Fixed dpll3_m2x2 rate calculation
  omap3: clock: Fix the DPLL freqsel computations
  omap: Fix keymap for zoom2 according to matrix keypad framwork