git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 19 Mar 2012 20:46:32 +0000 (20:46 +0000)
committer	Arnd Bergmann <arnd@arndb.de>
	Tue, 20 Mar 2012 09:41:43 +0000 (09:41 +0000)
commit	69274ff20198ec03d9b3a93ef13b30e63b18d1e0
tree	065282434bde6ef9b4357c042705c5fcef3782ea	tree \| snapshot
parent	3eda9689aac1b75b3e2de12a2fbb8cf9602ca8f3	commit \| diff
parent	ed6f84bc88fca7c53c2ec242ebd537833cac0e59	commit \| diff

Merge branch 'renesas/timer' into next/timer

Conflicts:
arch/arm/mach-shmobile/timer.c

This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Linux Kernel Source Tree.

RSS Atom

arch/arm/kernel/smp_twd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/include/mach/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/smp-sh73a0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/timer.c	diff1 \|	diff2 \|	blob \| history