tree abc3474193079032b02c4458d1fc78c57f65bd64
parent 997396a73a94de7d92d82e30d7bb1d931e38cb16
parent 58a5559e461a4ab945286dacef611d3c542c5fee
author Linus Torvalds <torvalds@linux-foundation.org> 1283029658 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1283029658 -0700

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:
  OMAP3: PM: ensure IO wakeups are properly disabled
  omap: Fix omap_4430sdp_defconfig for make oldconfig
  omap: Use CONFIG_SMP for test_for_ipi and test_for_ltirq
  omap: Fix sev instruction usage for multi-omap
  OMAP3: Fix a cpu type check problem
  omap3: id: fix 3630 rev detection