Merge branch 'master' of... (5e93c6b4) · Commits · github.com / kvm-riscv / linux

Commit 5e93c6b4 authored Jan 07, 2011 by

Paul Mundt

Merge branch 'master' of...


Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Kconfig

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

parents 98d27b8a 3c0cb7c3

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment