Linus Torvalds 6ba74014c1 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: (1443 commits) phy/marvell: add 88ec048 support igb: Program MDICNFG register prior to PHY init e1000e: correct MAC-PHY interconnect register offset for 82579 hso: Add new product ID can: Add driver for esd CAN-USB/2 device l2tp: fix export of header file for userspace can-raw: Fix skb_orphan_try handling Revert "net: remove zap_completion_queue" net: cleanup inclusion phy/marvell: add 88e1121 interface mode support u32: negative offset fix net: Fix a typo from "dev" to "ndev" igb: Use irq_synchronize per vector when using MSI-X ixgbevf: fix null pointer dereference due to filter being set for VLAN 0 e1000e: Fix irq_synchronize in MSI-X case e1000e: register pm_qos request on hardware activation ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice net: Add getsockopt support for TCP thin-streams cxgb4: update driver version cxgb4: add new PCI IDs ... Manually fix up conflicts in: - drivers/net/e1000e/netdev.c: due to pm_qos registration infrastructure changes - drivers/net/phy/marvell.c: conflict between adding 88ec048 support and cleaning up the IDs - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req conflict (registration change vs marking it static)		2010-08-04 11:47:58 -07:00
..
iseries
8xx_immap.h
8253pit.h
abs_addr.h	lmb: rename to memblock	2010-07-14 17:14:00 +10:00
agp.h
asm-compat.h	PPC: Add STLU	2010-05-17 12:18:30 +03:00
asm-offsets.h	kbuild: move asm-offsets.h to include/generated	2009-12-12 13:08:14 +01:00
async_tx.h	ppc440spe-adma: adds updated ppc440spe adma driver	2009-12-11 21:24:44 -07:00
atomic.h	powerpc: Rename LWSYNC_ON_SMP to PPC_RELEASE_BARRIER, ISYNC_ON_SMP to PPC_ACQUIRE_BARRIER	2010-02-17 14:03:15 +11:00
auxvec.h
backlight.h
bitops.h	powerpc: Rename LWSYNC_ON_SMP to PPC_RELEASE_BARRIER, ISYNC_ON_SMP to PPC_ACQUIRE_BARRIER	2010-02-17 14:03:15 +11:00
bitsperlong.h
bootx.h
btext.h
bug.h	panic: Allow warnings to set different taint flags	2010-05-19 08:36:48 +01:00
bugs.h
byteorder.h
cache.h	Merge branch 'for-35' of git://repo.or.cz/linux-kbuild	2010-06-01 08:55:52 -07:00
cacheflush.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
cell-pmu.h
cell-regs.h
checksum.h
clk_interface.h
code-patching.h
compat.h	improve sys_newuname() for compat architectures	2010-03-12 15:52:32 -08:00
cpm1.h	powerpc/cpm1: Mark micropatch code/data static and __init	2010-07-11 11:04:06 -05:00
cpm2.h
cpm.h	powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)	2010-07-11 11:03:22 -05:00
cputable.h	powerpc/e500mc: Implement machine check handler.	2010-05-21 07:41:52 -05:00
cputhreads.h
cputime.h	powerpc: Replace per_cpu(, smp_processor_id()) with __get_cpu_var()	2010-02-03 17:39:48 +11:00
current.h
dbdma.h
dbell.h
dcr-generic.h
dcr-mmio.h
dcr-native.h
dcr-regs.h	ppc440spe-adma: adds updated ppc440spe adma driver	2009-12-11 21:24:44 -07:00
dcr.h
delay.h
device.h	arch/powerpc: Move dma_mask from of_device into pdev_archdata	2010-05-22 00:10:40 -06:00
disassemble.h
div64.h
dma-mapping.h	dma-mapping: powerpc: use generic pci_set_dma_mask and pci_set_consistent_dma_mask	2010-03-12 15:52:42 -08:00
dma.h
edac.h
eeh_event.h
eeh.h
elf.h	powerpc: TIF_ABI_PENDING bit removal	2010-02-01 14:00:30 +11:00
emergency-restart.h
emulated_ops.h
errno.h
exception-64e.h
exception-64s.h
fb.h
fcntl.h
feature-fixups.h	powerpc: Fix lwsync feature fixup vs. modules on 64-bit	2010-02-26 18:29:17 +11:00
firmware.h
fixmap.h	powerpc: reserve fixmap entries for early debug	2009-12-12 22:24:30 -07:00
floppy.h
fs_pd.h
fsl_gtm.h
fsl_lbc.h
fsldma.h
ftrace.h
futex.h	powerpc: Rename LWSYNC_ON_SMP to PPC_RELEASE_BARRIER, ISYNC_ON_SMP to PPC_ACQUIRE_BARRIER	2010-02-17 14:03:15 +11:00
gpio.h	powerpc/gpio: support gpio_to_irq()	2009-12-10 20:08:15 -06:00
grackle.h
hardirq.h	powerpc: Convert global "BAD" interrupt to per cpu spurious	2010-02-17 14:02:49 +11:00
heathrow.h
highmem.h
hugetlb.h
hvcall.h	powerpc/pseries: Add hcall to read 4 ptes at a time in real mode	2010-05-21 17:31:10 +10:00
hvconsole.h
hvcserver.h
hw_irq.h	powerpc/perf_event: Fix oops due to perf_event_do_pending call	2010-05-12 14:34:00 +10:00
hydra.h
i8259.h
ibmebus.h
ide.h
immap_86xx.h
immap_cpm2.h
immap_qe.h
io-defs.h
io.h
ioctl.h
ioctls.h
iommu.h
ipcbuf.h
ipic.h
irq_regs.h
irq.h	powerpc: Unconditionally enabled irq stacks	2010-06-15 15:02:37 +10:00
irqflags.h
Kbuild
kdebug.h
kdump.h	powerpc: Move kdump default base address to 64MB on 64bit	2010-06-15 15:02:32 +10:00
kexec.h	powerpc/kexec: Fix boundary case for book-e kexec memory limits	2010-07-22 13:31:14 -05:00
keylargo.h
kgdb.h
kmap_types.h	kdb: core for kgdb back end (2 of 2)	2010-05-20 21:04:21 -05:00
kprobes.h
kvm_44x.h
kvm_asm.h	KVM: PPC: Enable native paired singles	2010-05-17 12:19:08 +03:00
kvm_book3s_32.h	KVM: PPC: Add kvm_book3s_32.h	2010-05-17 12:18:23 +03:00
kvm_book3s_64.h	KVM: PPC: Add kvm_book3s_64.h	2010-05-17 12:18:21 +03:00
kvm_book3s_asm.h	KVM: PPC: Use KVM_BOOK3S_HANDLER	2010-05-17 12:18:28 +03:00
kvm_book3s.h	KVM: PPC: Make use of hash based Shadow MMU	2010-08-01 10:47:28 +03:00
kvm_booke.h	KVM: PPC: Improve indirect svcpu accessors	2010-05-17 12:18:26 +03:00
kvm_e500.h	KVM: PPC E500: fix tlbcfg emulation	2010-03-01 12:36:06 -03:00
kvm_fpu.h	KVM: PPC: elide struct thread_struct instances from stack	2010-08-01 10:39:24 +03:00
kvm_host.h	KVM: Remove unnecessary divide operations	2010-08-01 10:47:30 +03:00
kvm_para.h
kvm_ppc.h	KVM: PPC: Extract MMU init	2010-05-17 12:18:34 +03:00
kvm.h	KVM: PPC: Allow userspace to unset the IRQ line	2010-05-17 12:16:51 +03:00
libata-portmap.h
linkage.h
local.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2010-03-03 07:34:18 -08:00
lppaca.h	powerpc/pseries: Add extended_cede_processor() helper function.	2009-11-24 14:33:03 +11:00
lv1call.h
machdep.h	sysfs/cpu: Add probe/release files	2009-12-09 17:09:33 +11:00
macio.h	powerpc/macio: Fix probing of macio devices by using the right of match table	2010-06-02 17:50:38 +10:00
mc146818rtc.h
mediabay.h	powerpc/macio: Rework hotplug media bay support	2009-12-09 17:09:14 +11:00
memblock.h	lmb: rename to memblock	2010-07-14 17:14:00 +10:00
mman.h
mmu_context.h	PPC: Split context init/destroy functions	2010-05-17 12:18:20 +03:00
mmu-8xx.h
mmu-40x.h
mmu-44x.h	powerpc/47x: Base ppc476 support	2010-05-05 09:11:10 -04:00
mmu-book3e.h
mmu-hash32.h
mmu-hash64.h	powerpc/mm: Add some debug output when hash insertion fails	2010-07-23 12:56:56 +10:00
mmu.h	powerpc/47x: Base ppc476 support	2010-05-05 09:11:10 -04:00
mmzone.h	powerpc/cpumask: Convert NUMA code to new cpumask API	2010-05-06 17:41:58 +10:00
module.h	module: handle ppc64 relocating kcrctabs when CONFIG_RELOCATABLE=y	2009-12-15 16:28:34 +10:30
mpc5xxx.h
mpc6xx.h
mpc8xx.h
mpc52xx_psc.h	spi/mpc5121: Add SPI master driver for MPC5121 PSC	2010-05-25 00:23:17 -06:00
mpc52xx.h
mpc5121.h	powerpc/mpc5121: Add machine restart support	2010-02-16 10:36:26 -07:00
mpc8260.h
mpic.h	powerpc/cpumask: Convert mpic driver to new cpumask API	2010-05-06 18:01:46 +10:00
msgbuf.h
msi_bitmap.h
mutex.h	powerpc: Rename LWSYNC_ON_SMP to PPC_RELEASE_BARRIER, ISYNC_ON_SMP to PPC_ACQUIRE_BARRIER	2010-02-17 14:03:15 +11:00
nvram.h
of_device.h	arch/powerpc: Move dma_mask from of_device into pdev_archdata	2010-05-22 00:10:40 -06:00
of_platform.h
ohare.h
oprofile_impl.h
paca.h	Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-05-21 17:16:21 -07:00
page_32.h
page_64.h	powerpc: remove unused __page_aligned definition.	2010-03-03 11:25:58 +01:00
page.h	powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32	2010-04-26 17:54:15 -05:00
param.h	powerpc: Simplify param.h by including <asm-generic/param.h>	2010-02-03 17:39:48 +11:00
parport.h	powerpc: Correct parport interrupt parsing	2010-05-06 16:49:26 +10:00
pasemi_dma.h
pci-bridge.h
pci.h	pci-dma: add linux/pci-dma.h to linux/pci.h	2010-03-12 15:52:42 -08:00
percpu.h
perf_event_fsl_emb.h	powerpc/perf: e500 support	2010-03-05 03:04:08 -06:00
perf_event_server.h	powerpc/perf: e500 support	2010-03-05 03:04:08 -06:00
perf_event.h	powerpc/perf: e500 support	2010-03-05 03:04:08 -06:00
pgalloc-32.h
pgalloc-64.h	powerpc/mm: Track backing pages allocated by vmemmap_populate()	2010-05-06 16:49:27 +10:00
pgalloc.h
pgtable-ppc32.h	powerpc/ppc32: Fixup pmd_page to work when ARCH_PFN_OFFSET is non-zero	2010-04-07 18:00:30 +10:00
pgtable-ppc64-4k.h
pgtable-ppc64-64k.h
pgtable-ppc64.h
pgtable.h	MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself	2010-02-20 16:41:46 +00:00
phyp_dump.h
pmac_feature.h	powerpc: Convert feature_lock to raw_spinlock	2010-02-19 14:52:32 +11:00
pmac_low_i2c.h	i2c-powermac: Include the i2c_adapter in struct pmac_i2c_bus	2009-12-06 17:06:19 +01:00
pmac_pfunc.h
pmc.h
pmi.h
poll.h
posix_types.h
ppc4xx.h
ppc_asm.h
ppc-opcode.h	powerpc/85xx: Make sure lwarx hint isn't set on ppc32	2010-03-16 23:24:06 -05:00
ppc-pci.h	powerpc/eeh: Fix a bug when pci structure is null	2010-02-17 14:02:47 +11:00
processor.h	KVM: PPC: Add SVCPU to Book3S_32	2010-05-17 12:18:43 +03:00
prom.h	of: remove undefined request_OF_resource & release_OF_resource	2010-02-14 13:02:45 -07:00
ps3.h
ps3av.h
ps3fb.h
ps3gpu.h
ps3stor.h
pSeries_reconfig.h	powerpc/pseries: Kernel DLPAR Infrastructure	2009-12-09 17:09:32 +11:00
pte-8xx.h	powerpc/8xx: Restore _PAGE_WRITETHRU	2009-12-09 17:10:37 +11:00
pte-40x.h
pte-44x.h
pte-book3e.h
pte-common.h
pte-fsl-booke.h
pte-hash32.h
pte-hash64-4k.h
pte-hash64-64k.h	powerpc/mm: Fix pgtable cache cleanup with CONFIG_PPC_SUBPAGE_PROT	2009-12-08 15:59:33 +11:00
pte-hash64.h
ptrace.h	powerpc: Fix userspace build of ptrace.h	2010-07-08 18:11:46 +10:00
qe_ic.h
qe.h
reg_8xx.h
reg_booke.h	powerpc/e500mc: Implement machine check handler.	2010-05-21 07:41:52 -05:00
reg_fsl_emb.h	powerpc/perf: e500 support	2010-03-05 03:04:08 -06:00
reg.h	Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-05-21 17:16:21 -07:00
resource.h
rheap.h
rio.h
rtas.h	locking: Convert raw_spinlock to arch_spinlock	2009-12-14 23:55:32 +01:00
rtc.h
rwsem.h
scatterlist.h	asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h	2010-05-27 09:12:54 -07:00
seccomp.h
sections.h
sembuf.h
serial.h
setjmp.h
setup.h
sfp-machine.h	Revert "endian: #define __BYTE_ORDER"	2010-05-26 08:30:15 -07:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h	powerpc/cpumask: Dynamically allocate cpu_sibling_map and cpu_core_map cpumasks	2010-05-06 17:41:56 +10:00
smu.h
socket.h
sockios.h
sparsemem.h	Revert "powerpc/mm: Bump SECTION_SIZE_BITS from 16MB to 256MB"	2010-04-13 13:54:39 +10:00
spinlock_types.h	locking: Convert raw_rwlock to arch_rwlock	2009-12-14 23:55:32 +01:00
spinlock.h	powerpc: Rename LWSYNC_ON_SMP to PPC_RELEASE_BARRIER, ISYNC_ON_SMP to PPC_ACQUIRE_BARRIER	2010-02-17 14:03:15 +11:00
spu_csa.h
spu_info.h
spu_priv1.h
spu.h
sstep.h
stat.h
statfs.h
string.h
suspend.h
swab.h
swiotlb.h
synch.h	powerpc: Use lwsync for acquire barrier if CPU supports it	2010-02-17 14:03:16 +11:00
syscall.h	powerpc: Use correct ccr bit for syscall error status	2010-03-19 16:38:16 +11:00
syscalls.h	improve sys_newuname() for compat architectures	2010-03-12 15:52:32 -08:00
systbl.h	improve sys_newuname() for compat architectures	2010-03-12 15:52:32 -08:00
system.h	net: NET_SKB_PAD should depend on L1_CACHE_BYTES	2010-06-15 18:16:43 -07:00
tce.h
termbits.h
termios.h
thread_info.h	add descriptive comment for TIF_MEMDIE task flag declaration.	2010-05-14 11:13:27 +02:00
time.h
timex.h
tlb.h
tlbflush.h
topology.h	powerpc/numa: Set a smaller value for RECLAIM_DISTANCE to enable zone reclaim	2010-05-21 17:31:12 +10:00
trace.h
tsi108_irq.h
tsi108_pci.h
tsi108.h
types.h
uaccess.h
ucc_fast.h
ucc_slow.h
ucc.h
ucontext.h
udbg.h	powerpc: gamecube/wii: early debugging using usbgecko	2009-12-12 22:24:31 -07:00
uic.h
unaligned.h
uninorth.h
unistd.h	Add generic sys_olduname()	2010-03-12 15:52:32 -08:00
user.h
vdso_datapage.h
vdso.h
vga.h
vio.h
xilinx_intc.h
xilinx_pci.h
xmon.h
xor.h