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)
commitf862f904d357dc0d3612347a8dbabe6fae037fbb
treed7f5c2d5f85fd9e1cfc36beae904dc4f9cca04a3
parent6f09e41d704fe0bc9157a5357480751d39361d01
parent3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Merge branch 'master' of /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>