David S. Miller aa4abc9bcc Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-tx.c net/8021q/vlan_core.c net/core/dev.c		2009-03-01 21:35:16 -08:00
..
boards	sh: ap325rxa: Revert ov772x support.	2009-02-27 15:41:14 +09:00
boot	sh: FTRACE renamed to FUNCTION_TRACER.	2008-10-31 16:20:36 +09:00
cchips	sh: Switch HD64461 from hw_interrupt_type to irq_chip	2008-12-22 18:43:50 +09:00
configs	sh: ap325rxa: Enable ov772x in defconfig.	2009-01-29 11:56:02 +09:00
drivers	PCI: sh: use generic INTx swizzle from PCI core	2009-01-07 11:13:15 -08:00
include	net: new user space API for time stamping of incoming and outgoing packets	2009-02-15 22:43:33 -08:00
kernel	sh: Storage class should be before const qualifier	2009-02-12 17:26:09 +09:00
lib	sh: Handle calling csum_partial with misaligned data	2009-01-29 11:56:02 +09:00
lib64	sh: Provide sdivsi3/udivsi3/udivdi3 for sh64, kill off libgcc linking.	2008-12-22 18:44:05 +09:00
math-emu	sh: Fix up the math-emu build.	2007-06-11 15:57:42 +09:00
mm	arch/sh/mm: Move a dereference below a NULL test	2009-01-21 17:41:14 +09:00
oprofile	sh: oprofile: Fix up the module build.	2008-12-22 19:32:27 +09:00
tools	sh: Consolidate rsk7203/7201 in to a new mach-rsk.	2008-12-22 18:44:02 +09:00
Kconfig	sh: Kill off obsolete busses from arch/sh/Kconfig.	2009-01-21 17:44:01 +09:00
Kconfig.cpu	sh: Disable big endian for SH-5.	2008-02-14 14:22:10 +09:00
Kconfig.debug	sh: Conditionalize the code dumper on CONFIG_DUMP_CODE.	2008-12-22 18:44:47 +09:00
Makefile	sh: mach-rsk: Use uImage generation by default for rsk7201/7203.	2008-12-22 18:44:49 +09:00