Merge branch 'picoxcell/devel' into next/devel
commit4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a
authorOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:12:47 +0000 (19 21:12 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 05:12:53 +0000 (19 21:12 -0800)
tree0ac643f1a0c57a88452ef017c61d325fab98d00a
parentf68453e076dcf140c4a7bdd385f239b1e41be983
parent1b46f8782c2607afa1298b0c7f7fe307fc0f7a5b
Merge branch 'picoxcell/devel' into next/devel

* picoxcell/devel: (1 commit)
  ARM: picoxcell: implement watchdog restart
MAINTAINERS
arch/arm/kernel/perf_event.c
arch/arm/mach-ux500/board-mop500.c
mm/vmalloc.c