android_kernel_xiaomi_sm8350/arch/sh
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
boards sh: Fix up ctrl_read/write stragglers in migor setup. 2010-03-02 11:52:28 +09:00
boot arch/sh/boot/compressed/cache.c: Checkpatch cleanup 2010-03-01 11:57:31 +09:00
cchips sh: Fix up hp6xx build. 2010-02-05 17:45:14 +09:00
configs sh: update sdk7786 defconfig. 2010-02-10 16:06:42 +09:00
drivers Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 2010-02-26 16:54:27 -08:00
include sh: Fix up flush_cache_vmap() on SMP. 2010-03-04 16:47:30 +09:00
kernel Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
lib arch/sh/lib/libgcc.h: Checkpatch cleanup 2010-03-01 11:57:29 +09:00
lib64
math-emu sh: Move over to dynamically allocated FPU context. 2010-01-13 12:51:40 +09:00
mm sh: Move PMB debugfs entry initialization to later stage 2010-03-05 01:11:31 +09:00
oprofile
tools Merge branch 'sh/stable-updates' 2010-01-18 20:47:37 +09:00
Kconfig sh: Disable generic IRQ probing. 2010-02-02 19:17:42 +09:00
Kconfig.cpu sh: Turn on speculative return for SH7785 and SH7786 2010-02-18 18:54:18 +09:00
Kconfig.debug
Makefile sh: mach-titan: Kill off unused PIO port mangling. 2010-01-28 15:08:21 +09:00