]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6c3c53538506897e4013b59868014dab14823c78
tree1c62be8b4da0bfc82fa7ffa1ad5b0e958266cbd1
parentad74ab472888ed1318bb94d9d096acb32bfbeca3
parent8a90b652f906d39b5a9b3c4333882e26737d2c3d
Merge branch 'master' of git://git.kernel.org/pub/scm/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