From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Jan 2011 22:50:38 +0000 (-0800)
Subject: Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: v3.0~2455
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e773202e227c8ebbf369b9b924e15cca4d93824b;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'for-torvalds' of git://git./linux/kernel/git/linusw/linux-stericsson

* 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ux500: allow 5500 and 8500 to be built together
  ux500: modem_irq is only for 5500
  ux500: dynamic SOC detection
  ux500: rename MOP board Kconfig
  ux500: remove build-time changing macros
---

e773202e227c8ebbf369b9b924e15cca4d93824b