Russell King 0b019a4155 Merge branches 'master' and 'devel' into for-linus ...

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig

2010-08-10 23:17:52 +01:00

..

boards

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

2010-08-06 18:13:19 +01:00

boot

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2010-06-04 15:42:09 -07:00

cchips

sh: Fix up hp6xx build.

2010-02-05 17:45:14 +09:00

configs

sh: fix up sh7785lcr_32bit_defconfig.

2010-05-24 08:33:53 +09:00

drivers

sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().

2010-06-07 11:42:01 +09:00

include

Merge branches 'master' and 'devel' into for-linus

2010-08-10 23:17:52 +01:00

kernel

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-08-06 09:30:52 -07:00

lib

arch/sh/lib/strlen.S: Checkpatch cleanup

2010-05-24 08:11:07 +09:00

lib64

sh64: Kill off special clear_page() implementation.

2009-08-04 17:17:00 +09:00

math-emu

Revert "endian: #define __BYTE_ORDER"

2010-05-26 08:30:15 -07:00

mm

lmb: rename to memblock

2010-07-14 17:14:00 +10:00

oprofile

sh: oprofile: Fix up count size mismatch for common impl.

2009-11-05 17:13:15 +09:00

tools

Merge branch 'sh/stable-updates'

2010-01-18 20:47:37 +09:00

Kconfig

time: Kill off CONFIG_GENERIC_TIME

2010-07-27 12:40:54 +02:00

Kconfig.cpu

sh: Turn on speculative return for SH7785 and SH7786

2010-02-18 18:54:18 +09:00

Kconfig.debug

sh: Remove old early serial console code V2

2009-12-15 12:07:35 +09:00

Makefile

sh: mach-sdk7786: update defconfig for compressed kernel image.

2010-04-26 17:45:34 +09:00