]> Git Repo - linux.git/commitdiff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <[email protected]>
Thu, 6 Jan 2011 09:24:07 +0000 (18:24 +0900)
committerPaul Mundt <[email protected]>
Thu, 6 Jan 2011 09:24:07 +0000 (18:24 +0900)
Conflicts:
arch/sh/kernel/cpu/sh2a/clock-sh7201.c

Signed-off-by: Paul Mundt <[email protected]>

Trivial merge
This page took 0.077585 seconds and 4 git commands to generate.