tree d7f5c2d5f85fd9e1cfc36beae904dc4f9cca04a3
parent 6f09e41d704fe0bc9157a5357480751d39361d01
parent 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
author Paul Mundt <lethal@linux-sh.org> 1294305847 +0900
committer Paul Mundt <lethal@linux-sh.org> 1294305847 +0900

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>