Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Mon, 9 Jan 2012 02:12:55 +0000 (11:12 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 9 Jan 2012 02:12:55 +0000 (11:12 +0900)
commitca371d2854d48c0c22e7aa031df182f96dc85820
tree1c62be8b4da0bfc82fa7ffa1ad5b0e958266cbd1
parent0d376945d0bc0a8f8e00861d506b10e42e8af372
parenta0e86bd4252519321b0d102dc4ed90557aa7bee9
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into sh-latest

Conflicts:
arch/arm/mach-shmobile/clock-sh73a0.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/arm/mach-shmobile/clock-sh73a0.c
arch/arm/mach-shmobile/include/mach/common.h