]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Thu, 6 Jan 2011 09:24:07 +0000 (18:24 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 6 Jan 2011 09:24:07 +0000 (18:24 +0900)
commitca7045483af2d2000098be5481f773e943b0c68c
treed7f5c2d5f85fd9e1cfc36beae904dc4f9cca04a3
parent923df88f2424499163503a46dbea4c0a65926163
parentb1d6256ab80481c7e660520326c38f375686235c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest

Conflicts:
arch/sh/kernel/cpu/sh2a/clock-sh7201.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>