| commit | e773202e227c8ebbf369b9b924e15cca4d93824b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 10 14:50:38 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 10 14:50:38 2011 -0800 |
| tree | 623a15fe0593e7ff2e79f0a5918fb4b3e739e2ee | |
| parent | abf8792d0e1b203e303ed1c02437e0e10a39dcda [diff] | |
| parent | d2a40972ec70bd2060d3c46050a101a9678d2991 [diff] |
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/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