David S. Miller ff9c38bba3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/mac80211/ht.c

2009-12-01 22:13:38 -08:00

..

.gitignore

…

alpha_ksyms.c

…

asm-offsets.c

…

binfmt_loader.c

alpha: binfmt_aout fix

2009-05-02 15:36:10 -07:00

console.c

…

core_apecs.c

…

core_cia.c

…

core_irongate.c

…

core_lca.c

…

core_marvel.c

arch/alpha/kernel: Add kmalloc NULL tests

2009-11-30 15:38:19 -05:00

core_mcpcia.c

…

core_polaris.c

…

core_t2.c

…

core_titan.c

arch/alpha/kernel: Add kmalloc NULL tests

2009-11-30 15:38:19 -05:00

core_tsunami.c

…

core_wildfire.c

…

entry.S

…

err_common.c

…

err_ev6.c

alpha: titan and marvel build fixes

2009-05-02 15:36:10 -07:00

err_ev7.c

alpha: titan and marvel build fixes

2009-05-02 15:36:10 -07:00

err_impl.h

alpha: titan and marvel build fixes

2009-05-02 15:36:10 -07:00

err_marvel.c

alpha: titan and marvel build fixes

2009-05-02 15:36:10 -07:00

err_titan.c

alpha: titan and marvel build fixes

2009-05-02 15:36:10 -07:00

es1888.c

…

gct.c

…

head.S

alpha: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:38 -07:00

init_task.c

alpha: use .data.init_task instead of .data.init_thread.

2009-09-24 17:16:22 -07:00

io.c

…

irq_alpha.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

irq_i8259.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

irq_impl.h

alpha: remove obsolete hw_interrupt_type

2009-06-16 19:47:46 -07:00

irq_pyxis.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

irq_srm.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

irq.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

machvec_impl.h

…

Makefile

alpha: binfmt_aout fix

2009-05-02 15:36:10 -07:00

module.c

…

ns87312.c

…

osf_sys.c

Push BKL into do_mount()

2009-06-11 21:36:08 -04:00

pci_impl.h

alpha: AGP update (fixes compile failure)

2009-09-24 07:21:06 -07:00

pci_iommu.c

alpha: AGP update (fixes compile failure)

2009-09-24 07:21:06 -07:00

pci-noop.c

…

pci-sysfs.c

…

pci.c

…

process.c

headers: utsname.h redux

2009-09-23 18:13:10 -07:00

proto.h

alpha: titan and marvel build fixes

2009-05-02 15:36:10 -07:00

ptrace.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

setup.c

alpha: bad macro expansion, parameter is member

2009-06-16 19:47:46 -07:00

signal.c

KEYS: Add missing linux/tracehook.h #inclusions

2009-09-09 18:30:02 +10:00

smc37c93x.c

…

smc37c669.c

…

smp.c

cpumask: arch_send_call_function_ipi_mask: alpha

2009-09-24 09:34:43 +09:30

srm_env.c

…

srmcons.c

…

sys_alcor.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_cabriolet.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_dp264.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_eb64p.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_eiger.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_jensen.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_marvel.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_miata.c

…

sys_mikasa.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_nautilus.c

…

sys_noritake.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_rawhide.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_ruffian.c

arch/alpha/kernel/sys_ruffian.c: Use DIV_ROUND_CLOSEST

2009-11-30 15:37:25 -05:00

sys_rx164.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_sable.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_sio.c

…

sys_sx164.c

…

sys_takara.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_titan.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

sys_wildfire.c

alpha: Fixup last users of irq_chip->typename

2009-11-30 22:51:31 -05:00

systbls.S

net: Introduce recvmmsg socket syscall

2009-10-12 23:40:10 -07:00

time.c

alpha: convert to use arch_gettimeoffset()

2009-09-22 07:17:43 -07:00

traps.c

…

vmlinux.lds.S

alpha: Fix duplicate <asm/thread_info.h> include

2009-09-27 14:46:05 -07:00