Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Fri, 7 Jan 2011 01:29:26 +0000 (10:29 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 7 Jan 2011 01:29:26 +0000 (10:29 +0900)
commit5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee
tree4f4e321a1ca0baf64d8af528080c71f93495a7d7
parent98d27b8abf413a310df6676f7d2128ada1cccc08
parent3c0cb7c31c206aaedb967e44b98442bbeb17a6c4
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6 into rmobile-latest

Conflicts:
arch/arm/mach-shmobile/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/arm/Kconfig
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mm/Kconfig