kernel-fxtec-pro1x/arch/sparc/kernel
Linus Torvalds 06f4e926d2 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: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
2011-05-20 13:43:21 -07:00
..
.gitignore
apc.c sparc32: fix section mismatch warnings in apc, pmc and time_32 2011-04-21 15:37:20 -07:00
asm-offsets.c
audit.c
auxio_32.c sparc: explicitly cast negative phandle checks to s32 2011-01-03 20:02:06 -07:00
auxio_64.c sparc64: Fix section mis-match errors. 2011-03-30 17:37:56 -07:00
btext.c
central.c sparc64: Fix section mis-match errors. 2011-03-30 17:37:56 -07:00
cherrs.S
chmc.c dt/sparc: Eliminate users of of_platform_{,un}register_driver 2011-02-28 01:36:39 -07:00
compat_audit.c
cpu.c sparc32/leon: FPU-FSR only available when FPU present 2011-03-16 18:19:05 -07:00
cpumap.c
cpumap.h
devices.c
dma.c
ds.c sparc64: Fix section mis-match errors. 2011-03-30 17:37:56 -07:00
dtlb_miss.S
dtlb_prot.S
ebus.c
entry.h sparc64: rename virt_irq => irq - I 2011-03-16 18:19:03 -07:00
entry.S Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6 2011-04-07 11:14:49 -07:00
etrap_32.S
etrap_64.S
fpu_traps.S
ftrace.c
getsetcc.S
head_32.S sparc: use _start for the start entry (like 64 bit does) 2011-01-04 19:25:04 -08:00
head_64.S Fix common misspellings 2011-03-31 11:26:23 -03:00
helpers.S
hvapi.c
hvcalls.S
hvtramp.S
idprom.c
init_task.c Fix common misspellings 2011-03-31 11:26:23 -03:00
iommu.c sparc64: Fix build errors with gcc-4.6.0 2011-03-16 18:19:15 -07:00
iommu_common.h
ioport.c sparc: Fix sbus_alloc_coherent error handling. 2011-03-16 18:18:59 -07:00
irq.h sparc32,sun4m: percpu and global register definitions moved to irq.h 2011-03-16 18:19:14 -07:00
irq_32.c sparc32: introduce build_device_irq 2011-03-16 18:19:14 -07:00
irq_64.c sparc: Use generic show_interrupts() 2011-03-29 14:48:14 +02:00
itlb_miss.S
ivec.S
jump_label.c
kernel.h sparc32: fix build with leon or floppy enabled 2011-03-16 18:19:13 -07:00
kgdb_32.c
kgdb_64.c
kprobes.c
kstack.h
ktlb.S
ldc.c sparc64: Fix build errors with gcc-4.6.0 2011-03-16 18:19:15 -07:00
led.c
leon_kernel.c sparc32: introduce sparc_irq_config 2011-03-16 18:19:13 -07:00
leon_pmc.c SPARC/LEON: power down instruction different of different LEONs 2011-03-16 18:19:04 -07:00
leon_smp.c sparc32: fix build with leon or floppy enabled 2011-03-16 18:19:13 -07:00
Makefile sparc32: remove tick14.c 2011-03-16 18:19:08 -07:00
mdesc.c sparc64: Fix section mis-match errors. 2011-03-30 17:37:56 -07:00
misctrap.S
module.c mm: unify module_alloc code for vmalloc 2011-01-13 17:32:34 -08:00
muldiv.c
nmi.c perf, arch: Cleanup perf-pmu init vs lockup-detector 2010-11-26 15:14:56 +01:00
of_device_32.c sparc32: introduce build_device_irq 2011-03-16 18:19:14 -07:00
of_device_64.c Fix common misspellings 2011-03-31 11:26:23 -03:00
of_device_common.c sparc: Implement of_iomap(). 2011-03-18 15:47:26 -07:00
of_device_common.h
pci.c sparc: Convert to new irq function names 2011-03-29 14:48:14 +02:00
pci_common.c sparc64: Fix build errors with gcc-4.6.0 2011-03-16 18:19:15 -07:00
pci_fire.c sparc64: Fix section mis-match errors. 2011-03-30 17:37:56 -07:00
pci_impl.h sparc64: rename virt_irq => irq - II 2011-03-16 18:19:03 -07:00
pci_msi.c sparc: Convert to new irq function names 2011-03-29 14:48:14 +02:00
pci_psycho.c sparc64: Fix section mis-match errors. 2011-03-30 17:37:56 -07:00
pci_sabre.c drivercore: revert addition of of_match to struct device 2011-05-18 12:32:23 -06:00
pci_schizo.c drivercore: revert addition of of_match to struct device 2011-05-18 12:32:23 -06:00
pci_sun4v.c sparc64: Fix section mis-match errors. 2011-03-30 17:37:56 -07:00
pci_sun4v.h
pci_sun4v_asm.S
pcic.c sparc: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
pcr.c sparc64: Fix build errors with gcc-4.6.0 2011-03-16 18:19:15 -07:00
perf_event.c Fix common misspellings 2011-03-31 11:26:23 -03:00
pmc.c sparc32: fix section mismatch warnings in apc, pmc and time_32 2011-04-21 15:37:20 -07:00
power.c sparc64: Fix section mis-match errors. 2011-03-30 17:37:56 -07:00
process_32.c
process_64.c
prom.h
prom_32.c SPARC/LEON: avoid AMBAPP name duplicates in openprom fs when REG is missing 2011-01-04 11:16:37 -08:00
prom_64.c
prom_common.c
prom_irqtrans.c sparc64: rename virt_irq => irq - II 2011-03-16 18:19:03 -07:00
psycho_common.c
psycho_common.h
ptrace_32.c
ptrace_64.c sparc64: Fix build errors with gcc-4.6.0 2011-03-16 18:19:15 -07:00
reboot.c
rtrap_32.S
rtrap_64.S
sbus.c
setup_32.c sparc32: add irq + smp declarations to headers 2011-03-16 18:19:08 -07:00
setup_64.c
signal32.c
signal_32.c
signal_64.c
smp_32.c Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-05-19 17:41:22 -07:00
smp_64.c sched: Provide scheduler_ipi() callback in response to smp_send_reschedule() 2011-04-14 08:52:32 +02:00
sparc_ksyms_32.c
sparc_ksyms_64.c
spiterrs.S
sstate.c
stacktrace.c
starfire.c sparc: explicitly cast negative phandle checks to s32 2011-01-03 20:02:06 -07:00
sun4c_irq.c sparc32: introduce sparc_irq_config 2011-03-16 18:19:13 -07:00
sun4d_irq.c sparc32: introduce build_device_irq 2011-03-16 18:19:14 -07:00
sun4d_smp.c sparc32,sun4d: irq, smp files cleanup 2011-03-16 18:19:10 -07:00
sun4m_irq.c sparc32,sun4m: percpu and global register definitions moved to irq.h 2011-03-16 18:19:14 -07:00
sun4m_smp.c sparc32,sun4m: irq, smp files cleanup 2011-03-16 18:19:09 -07:00
sun4v_ivec.S
sun4v_tlb_miss.S
sys32.S
sys_sparc32.c
sys_sparc_32.c
sys_sparc_64.c sparc64: Sharpen address space randomization calculations. 2011-03-16 18:19:12 -07:00
syscalls.S
sysfs.c
systbls.h
systbls_32.S net: Add sendmmsg socket system call 2011-05-05 11:10:14 -07:00
systbls_64.S net: Add sendmmsg socket system call 2011-05-05 11:10:14 -07:00
tadpole.c
time_32.c sparc32: fix section mismatch warnings in apc, pmc and time_32 2011-04-21 15:37:20 -07:00
time_64.c sparc64: Fix section mis-match errors. 2011-03-30 17:37:56 -07:00
trampoline_32.S
trampoline_64.S
traps_32.c
traps_64.c sparc64: Fix build errors with gcc-4.6.0 2011-03-16 18:19:15 -07:00
tsb.S
ttable.S
una_asm_32.S sparc32: unaligned memory access (MNA) trap handler bug 2011-02-01 12:39:59 -08:00
una_asm_64.S sparc: Fix .size directive for do_int_load 2011-03-16 18:19:15 -07:00
unaligned_32.c
unaligned_64.c
us2e_cpufreq.c
us3_cpufreq.c
utrap.S
vio.c
viohs.c
visemul.c
vmlinux.lds.S percpu: align percpu readmostly subsection to cacheline 2011-01-25 14:26:50 +01:00
windows.c
winfixup.S
wof.S
wuf.S