David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig		2009-11-18 22:19:03 -08:00
..
boards	sh: rsk7203 CONFIG_MTD=n fix	2009-10-26 19:46:24 +09:00
boot	sh: add uImage.bin target	2009-10-26 19:46:25 +09:00
cchips	sh: mach-hp6xx: Fix up the hp6xx build for hd64461 changes.	2009-05-20 11:27:13 +09:00
configs	sh: enable onenand support in kfr2r09 defconfig.	2009-09-25 11:55:07 +09:00
drivers	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into for-linus	2009-09-23 18:31:11 +10:00
include	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
kernel	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
lib	sh: Kill off dcache writeback from copy_page().	2009-09-08 16:23:08 +09:00
lib64	sh64: Kill off special clear_page() implementation.	2009-08-04 17:17:00 +09:00
math-emu	sh: Fix up the math-emu build.	2007-06-11 15:57:42 +09:00
mm	sh: Account for cache aliases in flush_icache_range()	2009-11-09 10:45:30 +09:00
oprofile	sh: oprofile: Kill off dead valid_kernel_stack().	2009-08-14 04:59:50 +09:00
tools	sh: sh7785lcr: fix prototype board on 32bit MMU mode.	2009-08-28 10:19:13 +09:00
Kconfig	sh: Fix hugetlbfs dependencies for SH-3 && MMU configurations.	2009-10-27 07:22:37 +09:00
Kconfig.cpu	sh: Tidy up SH-4A boot_cpu_data.flags probing.	2009-06-01 19:50:08 +09:00
Kconfig.debug	sh: Add initial support for SH7757 CPU subtype	2009-08-21 17:25:47 +09:00
Makefile	sh: Document uImage.bin target in archhelp.	2009-10-27 07:17:12 +09:00