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
..
agp.h
apb.h
apc.h
asi.h
asm-offsets.h	kbuild: move asm-offsets.h to include/generated	2009-12-12 13:08:14 +01:00
asm.h
asmmacro.h
atomic.h
atomic_32.h	atomic_t: Cast to volatile when accessing atomic variables	2010-05-17 07:57:27 -07:00
atomic_64.h	sparc64: Really fix atomic64_t interface types.	2010-08-17 21:44:13 -07:00
auxio.h
auxio_32.h
auxio_64.h
auxvec.h
backoff.h	sparc64: Make lock backoff really a NOP on UP builds.	2010-08-18 22:53:26 -07:00
bbc.h
bitext.h
bitops.h
bitops_32.h	bitops: remove minix bitops from asm/bitops.h	2011-03-23 19:46:22 -07:00
bitops_64.h	bitops: remove minix bitops from asm/bitops.h	2011-03-23 19:46:22 -07:00
bitsperlong.h
btext.h	sparc64: Faster early-boot framebuffer console.	2009-11-27 17:33:43 -08:00
btfixup.h
bug.h
bugs.h
byteorder.h
cache.h	sparc: remove homegrown L1_CACHE_ALIGN macro	2010-06-29 00:38:02 -07:00
cacheflush.h
cacheflush_32.h	block: add helpers to run flush_dcache_page() against a bio and a request's pages	2009-11-26 09:16:19 +01:00
cacheflush_64.h	block: add helpers to run flush_dcache_page() against a bio and a request's pages	2009-11-26 09:16:19 +01:00
chafsr.h
checksum.h
checksum_32.h
checksum_64.h
chmctrl.h
clock.h
cmt.h
compat.h	compat: Make compat_alloc_user_space() incorporate the access_ok()	2010-09-14 16:08:45 -07:00
compat_signal.h
contregs.h
cpudata.h
cpudata_32.h
cpudata_64.h	sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86.	2010-04-12 22:37:07 -07:00
cputime.h
current.h
cypress.h
dcr.h
dcu.h
delay.h
delay_32.h
delay_64.h
device.h	of: remove asm/of_device.h	2010-07-24 09:57:52 -06:00
display7seg.h
div64.h
dma-mapping.h	dma-mapping: remove dma_is_consistent API	2010-08-11 08:59:21 -07:00
dma.h
ebus_dma.h
ecc.h
eeprom.h
elf.h
elf_32.h	elf: kill USE_ELF_CORE_DUMP	2009-12-16 07:20:12 -08:00
elf_64.h	sparc: TIF_ABI_PENDING bit removal	2010-01-29 08:22:01 -08:00
emergency-restart.h
envctrl.h
errno.h	mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally	2011-03-17 13:08:27 -03:00
estate.h
fb.h	sparc: Really fix "console=" for serial consoles.	2010-08-16 12:26:09 -07:00
fbio.h	tree-wide: s/widht/width/g typo in comments	2010-02-05 12:22:42 +01:00
fcntl.h	vfs: add nonconflicting values for O_PATH	2011-03-16 09:54:02 -04:00
fhc.h
fixmap.h
floppy.h
floppy_32.h	of/sparc: convert various prom_* functions to use phandle	2010-10-09 02:33:34 -06:00
floppy_64.h	of/device: Replace of_device with platform_device in includes and core code	2010-07-24 09:58:21 -06:00
fpumacro.h
ftrace.h
futex.h
futex_32.h
futex_64.h	futex: Sanitize futex ops argument types	2011-03-11 12:23:31 +01:00
gpio.h
hardirq.h
hardirq_32.h	sparc32: convert to asm-generic/hardirq.h	2009-10-01 13:45:13 -07:00
hardirq_64.h
head.h
head_32.h
head_64.h
highmem.h	mm: stack based kmap_atomic()	2010-10-26 16:52:08 -07:00
hugetlb.h
hvtramp.h
hw_irq.h
hypervisor.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
ide.h
idprom.h
intr_queue.h
io-unit.h
io.h
io_32.h	fbmem: fix fb_read, fb_write unaligned accesses	2010-10-27 18:03:08 -07:00
io_64.h	fbmem: fix fb_read, fb_write unaligned accesses	2010-10-27 18:03:08 -07:00
ioctl.h
ioctls.h	tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys	2011-02-17 14:16:30 -08:00
iommu.h
iommu_32.h
iommu_64.h
ipcbuf.h
irq.h
irq_32.h	sparc: Provide NO_IRQ definition.	2011-03-18 15:03:16 -07:00
irq_64.h	sparc: Provide NO_IRQ definition.	2011-03-18 15:03:16 -07:00
irq_regs.h
irqflags.h
irqflags_32.h	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01:00
irqflags_64.h	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01:00
jsflash.h
jump_label.h	jump label: Introduce static_branch() interface	2011-04-04 12:48:08 -04:00
Kbuild	sparc: stop exporting openprom.h header	2010-10-08 13:04:00 -06:00
kdebug.h
kdebug_32.h
kdebug_64.h
kgdb.h
kmap_types.h
kprobes.h
ldc.h
leon.h	sparc32: fix build with leon or floppy enabled	2011-03-16 18:19:13 -07:00
leon_amba.h	SPARC/LEON: power down instruction different of different LEONs	2011-03-16 18:19:04 -07:00
linkage.h
local.h
local64.h	arch: Implement local64_t	2010-06-09 11:12:36 +02:00
lsu.h
machines.h
mbus.h
mc146818rtc.h
mc146818rtc_32.h
mc146818rtc_64.h
mdesc.h
memblock.h	memblock: Introduce default allocation limit and use it to replace explicit ones	2010-08-05 12:56:07 +10:00
memctrl.h
memreg.h
mman.h	mm: add MAP_HUGETLB for mmaping pseudo-anonymous huge page regions	2009-09-22 07:17:41 -07:00
mmu.h
mmu_32.h	sparc32: add irq + smp declarations to headers	2011-03-16 18:19:08 -07:00
mmu_64.h
mmu_context.h
mmu_context_32.h
mmu_context_64.h
mmzone.h
module.h
mpmbox.h
msgbuf.h
msi.h
mutex.h
mxcc.h
nmi.h
ns87303.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
obio.h
openprom.h	sparc: Pass buffer pointer all the way down to prom_{get,put}char().	2010-11-30 14:33:29 -08:00
openpromio.h
oplib.h
oplib_32.h	sparc: fix sparse warnings in arch/sparc/prom for 32 bit build	2011-01-03 12:15:12 -08:00
oplib_64.h	sparc: Eliminate prom_stdin.	2010-12-12 14:57:53 -08:00
page.h
page_32.h	sparc32: Fix page_to_phys().	2010-01-14 03:14:53 -08:00
page_64.h
param.h	sparc: Simplify param.h by simply including <asm-generic/param.h>	2010-01-12 02:46:16 -08:00
parport.h	dt/sparc: Eliminate users of of_platform_{,un}register_driver	2011-02-28 01:36:39 -07:00
pbm.h
pci.h	pci-dma: add linux/pci-dma.h to linux/pci.h	2010-03-12 15:52:42 -08:00
pci_32.h	pci-dma: sparc: use include/linux/pci-dma.h	2010-03-12 15:52:41 -08:00
pci_64.h	sparc: remove dma64_addr_t usage	2010-10-27 18:03:17 -07:00
pcic.h
pcr.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
percpu.h
percpu_32.h
percpu_64.h
perf_event.h	perf, arch: Cleanup perf-pmu init vs lockup-detector	2010-11-26 15:14:56 +01:00
perfctr.h	sparc64: Kill off old sys_perfctr system call and state.	2010-03-03 08:08:49 -08:00
pgalloc.h
pgalloc_32.h
pgalloc_64.h
pgtable.h
pgtable_32.h	mm: remove pte_*map_nested()	2010-10-26 16:52:08 -07:00
pgtable_64.h	mm: remove pte_*map_nested()	2010-10-26 16:52:08 -07:00
pgtsrmmu.h
pgtsun4.h
pgtsun4c.h
pil.h
poll.h
posix_types.h
processor.h
processor_32.h
processor_64.h
prom.h	of/promtree: make drivers/of/pdt.c no longer sparc-only	2010-10-10 21:53:30 -06:00
psr.h
psrcompat.h
pstate.h
ptrace.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
resource.h
ross.h
rwsem.h	rwsem: Move duplicate function prototypes to linux/rwsem.h	2011-01-27 12:30:39 +01:00
sbi.h
scatterlist.h	remove needless ISA_DMA_THRESHOLD	2010-08-07 18:15:50 +02:00
scratchpad.h
seccomp.h
sections.h
sembuf.h
serial.h
setup.h
sfafsr.h
sfp-machine.h
sfp-machine_32.h
sfp-machine_64.h
shmbuf.h
shmparam.h
shmparam_32.h
shmparam_64.h
sigcontext.h
siginfo.h
signal.h
smp.h
smp_32.h	sparc32: add irq + smp declarations to headers	2011-03-16 18:19:08 -07:00
smp_64.h	cpumask: remove arch_send_call_function_ipi	2009-09-24 09:34:47 +09:30
smpprim.h
socket.h	net: Generalize socket rx gap / receive queue overflow cmsg	2009-10-12 13:26:31 -07:00
sockios.h
sparsemem.h
spinlock.h
spinlock_32.h	locking: Convert raw_rwlock functions to arch_rwlock	2009-12-14 23:55:32 +01:00
spinlock_64.h	locking: Convert raw_rwlock functions to arch_rwlock	2009-12-14 23:55:32 +01:00
spinlock_types.h	locking: Convert raw_rwlock to arch_rwlock	2009-12-14 23:55:32 +01:00
spitfire.h
stacktrace.h
starfire.h
stat.h	sparc: Fix use of uid16_t and gid16_t in asm/stat.h	2010-03-27 08:36:18 -07:00
statfs.h
string.h
string_32.h	sparc: Stop trying to be so fancy and use __builtin_{memcpy,memset}()	2009-12-10 23:32:10 -08:00
string_64.h	sparc: Stop trying to be so fancy and use __builtin_{memcpy,memset}()	2009-12-10 23:32:10 -08:00
sunbpp.h
swab.h
swift.h
syscall.h	tracing: Unify arch_syscall_addr() implementations	2010-02-17 13:07:21 +01:00
syscalls.h
sysen.h
system.h
system_32.h
system_64.h	sparc64: Fill a missing delay slot.	2010-08-19 14:15:32 -07:00
termbits.h	tty: Add EXTPROC support for LINEMODE	2010-08-10 13:47:39 -07:00
termios.h
thread_info.h
thread_info_32.h	mm: NUMA aware alloc_thread_info_node()	2011-03-22 17:44:01 -07:00
thread_info_64.h	mm: NUMA aware alloc_thread_info_node()	2011-03-22 17:44:01 -07:00
timer.h
timer_32.h
timer_64.h
timex.h
timex_32.h	sparc: convert to arch_gettimeoffset()	2010-01-15 01:34:28 -08:00
timex_64.h
tlb.h
tlb_32.h
tlb_64.h
tlbflush.h
tlbflush_32.h
tlbflush_64.h
topology.h
topology_32.h
topology_64.h	sched, sparc64: Turn cpu_coregroup_mask() into a real function	2011-04-12 08:46:41 +02:00
trap_block.h
traps.h
tsb.h
tsunami.h
ttable.h
turbosparc.h
types.h	remove dma64_addr_t	2011-03-23 19:47:18 -07:00
uaccess.h
uaccess_32.h	sparc: Kill user copy check code.	2010-08-09 00:45:46 -07:00
uaccess_64.h	sparc: Kill user copy check code.	2010-08-09 00:45:46 -07:00
uctx.h
unaligned.h
unistd.h	net: Add sendmmsg socket system call	2011-05-05 11:10:14 -07:00
upa.h
user.h
utrap.h
vac-ops.h
vaddrs.h
vga.h
viking.h
vio.h	BUILD_BUG_ON(): fix it and a couple of bogus uses of it	2009-09-23 07:39:29 -07:00
visasm.h
watchdog.h
winmacro.h
xor.h
xor_32.h
xor_64.h