commit | 92d7c9b2312474ce1259d71b4e50e01ae9fa95ea | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 20 09:59:08 2010 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 20 09:59:08 2010 -0800 |
tree | 9d04d1a7bb1c17ff5d95c576bd8fe4bdbb043647 | |
parent | 9e0afb9437c68be62085d74407b169732108a929 [diff] | |
parent | 1cf215a5b43950d1a304373037828158057ff9fc [diff] |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: ARM: mach-shmobile: INTC interrupt priority level demux fix ARM: mach-shmobile: fix compile warning in mm/init.c