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

Conflicts:
	arch/sh/include/asm/Kbuild
	drivers/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2010-08-16 13:32:24 +09:00
commit bbcf6e8b66
8024 changed files with 532026 additions and 595422 deletions

Some files were not shown because too many files have changed in this diff Show more