kevin/linux
1
Fork 0
Code
d7fc02c7ba
linux/arch/mips/kernel
History
Linus Torvalds d7fc02c7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
  mac80211: fix reorder buffer release
  iwmc3200wifi: Enable wimax core through module parameter
  iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
  iwmc3200wifi: Coex table command does not expect a response
  iwmc3200wifi: Update wiwi priority table
  iwlwifi: driver version track kernel version
  iwlwifi: indicate uCode type when fail dump error/event log
  iwl3945: remove duplicated event logging code
  b43: fix two warnings
  ipw2100: fix rebooting hang with driver loaded
  cfg80211: indent regulatory messages with spaces
  iwmc3200wifi: fix NULL pointer dereference in pmkid update
  mac80211: Fix TX status reporting for injected data frames
  ath9k: enable 2GHz band only if the device supports it
  airo: Fix integer overflow warning
  rt2x00: Fix padding bug on L2PAD devices.
  WE: Fix set events not propagated
  b43legacy: avoid PPC fault during resume
  b43: avoid PPC fault during resume
  tcp: fix a timewait refcnt race
  ...

Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
CTL_UNNUMBERED removed) in
	kernel/sysctl_check.c
	net/ipv4/sysctl_net_ipv4.c
	net/ipv6/addrconf.c
	net/sctp/sysctl.c
2009-12-08 07:55:01 -08:00
..
.gitignore
8250-platform.c
asm-offsets.c MIPS: Use PAGE_SIZE in assembly instead of _PAGE_SIZE. 2009-09-17 20:07:48 +02:00
binfmt_elfn32.c
binfmt_elfo32.c
branch.c
cevt-bcm1480.c MIPS: Add IRQF_TIMER flag for timer interrupts 2009-11-02 12:00:02 +01:00
cevt-ds1287.c MIPS: Add IRQF_TIMER flag for timer interrupts 2009-11-02 12:00:02 +01:00
cevt-gt641xx.c MIPS: Add IRQF_TIMER flag for timer interrupts 2009-11-02 12:00:02 +01:00
cevt-r4k.c MIPS: Add IRQF_TIMER flag for timer interrupts 2009-11-02 12:00:02 +01:00
cevt-sb1250.c MIPS: Add IRQF_TIMER flag for timer interrupts 2009-11-02 12:00:02 +01:00
cevt-smtc.c MIPS: SMTC: Fix lockup in smtc_distribute_timer 2009-11-13 18:10:38 +01:00
cevt-txx9.c MIPS: Add IRQF_TIMER flag for timer interrupts 2009-11-02 12:00:02 +01:00
cpu-bugs64.c MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
cpu-probe.c MIPS: SPRAM: Clean up support code a little 2009-11-02 12:00:05 +01:00
csrc-bcm1480.c
csrc-ioasic.c
csrc-r4k.c
csrc-sb1250.c
early_printk.c
entry.S
genex.S
gpio_txx9.c
head.S MIPS: Avoid potential hazard on Context register 2009-11-02 12:00:07 +01:00
i8253.c MIPS: Add IRQF_TIMER flag for timer interrupts 2009-11-02 12:00:02 +01:00
i8259.c
init_task.c Use new __init_task_data macro in arch init_task.c files. 2009-09-21 06:27:08 +02:00
irq_cpu.c
irq_txx9.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
irq-gic.c MIPS: GIC: Random fixes and enhancements. 2009-11-02 12:00:06 +01:00
irq-gt641xx.c
irq-msc01.c
irq-rm7000.c
irq-rm9000.c
irq.c
kgdb.c
kspd.c MIPS: VPE: Fix build after the credential changes a while ago. 2009-09-30 21:47:02 +02:00
linux32.c sysctl: mips Use the compat_sys_sysctl 2009-11-06 03:53:18 -08:00
machine_kexec.c
Makefile mips: fix build of vmlinux.lds 2009-09-25 19:49:27 +02:00
mips_ksyms.c
mips-mt-fpaff.c MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
mips-mt.c MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
module.c MIPS: Module: Make error messages unique. 2009-08-03 17:52:48 +01:00
octeon_switch.S MIPS: Consolidate all CONFIG_CPU_HAS_LLSC use in a single C file. 2009-09-17 20:07:49 +02:00
proc.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
process.c MIPS: Avoid clobbering struct pt_regs in kthreads 2009-08-03 17:52:41 +01:00
ptrace32.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
ptrace.c
r4k_fpu.S
r4k_switch.S MIPS: Consolidate all CONFIG_CPU_HAS_LLSC use in a single C file. 2009-09-17 20:07:49 +02:00
r2300_fpu.S
r2300_switch.S MIPS: Consolidate all CONFIG_CPU_HAS_LLSC use in a single C file. 2009-09-17 20:07:49 +02:00
r6000_fpu.S
relocate_kernel.S
reset.c
rtlx.c MIPS: VPE: Get rid of BKL. 2009-09-30 21:47:02 +02:00
scall32-o32.S net: Introduce recvmmsg socket syscall 2009-10-12 23:40:10 -07:00
scall64-64.S net: Introduce recvmmsg socket syscall 2009-10-12 23:40:10 -07:00
scall64-n32.S Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-12-08 07:55:01 -08:00
scall64-o32.S Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-12-08 07:55:01 -08:00
setup.c MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
signal32.c
signal_n32.c
signal-common.h
signal.c KEYS: Add missing linux/tracehook.h #inclusions 2009-09-09 18:30:02 +10:00
smp-cmp.c cpumask: Use accessors for cpu_*_mask: mips 2009-09-24 09:34:48 +09:30
smp-mt.c cpumask: Use accessors for cpu_*_mask: mips 2009-09-24 09:34:48 +09:30
smp-up.c cpumask: arch_send_call_function_ipi_mask: mips 2009-09-24 09:34:45 +09:30
smp.c MIPS: SMP: Inline arch_send_call_function_{single_ipi,ipi_mask} 2009-09-30 21:47:00 +02:00
smtc-asm.S
smtc-proc.c
smtc.c MIPS: SMTC: Avoid queing multiple reschedule IPIs 2009-11-02 12:00:06 +01:00
spram.c MIPS: SPRAM: Clean up support code a little 2009-11-02 12:00:05 +01:00
stacktrace.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
sync-r4k.c
syscall.c MIPS: Fix MIPS I build. 2009-12-02 18:09:51 +00:00
time.c
topology.c
traps.c MIPS: Rewrite sysmips(MIPS_ATOMIC_SET, ...) in C with inline assembler 2009-09-17 20:07:49 +02:00
unaligned.c
vmlinux.lds.S mips: fix build of vmlinux.lds 2009-09-25 19:49:27 +02:00
vpe.c MIPS: VPE: Remove stray unlock_kernel. 2009-11-02 12:00:02 +01:00
watch.c