Linus Torvalds 6d6b89bd2e 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: (1341 commits)
  virtio_net: remove forgotten assignment
  be2net: fix tx completion polling
  sis190: fix cable detect via link status poll
  net: fix protocol sk_buff field
  bridge: Fix build error when IGMP_SNOOPING is not enabled
  bnx2x: Tx barriers and locks
  scm: Only support SCM_RIGHTS on unix domain sockets.
  vhost-net: restart tx poll on sk_sndbuf full
  vhost: fix get_user_pages_fast error handling
  vhost: initialize log eventfd context pointer
  vhost: logging thinko fix
  wireless: convert to use netdev_for_each_mc_addr
  ethtool: do not set some flags, if others failed
  ipoib: returned back addrlen check for mc addresses
  netlink: Adding inode field to /proc/net/netlink
  axnet_cs: add new id
  bridge: Make IGMP snooping depend upon BRIDGE.
  bridge: Add multicast count/interval sysfs entries
  bridge: Add hash elasticity/max sysfs entries
  bridge: Add multicast_snooping sysfs toggle
  ...

Trivial conflicts in Documentation/feature-removal-schedule.txt

2010-03-02 07:55:08 -08:00

..

ABI

Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block

2010-03-01 09:00:29 -08:00

accounting

Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS

2009-09-23 07:39:28 -07:00

acpi

ACPI: support customizing ACPI control methods at runtime

2009-12-11 01:50:08 -05:00

aoe

aoe: user can ask driver to forget previously detected devices

2008-02-08 09:22:31 -08:00

arm

ARM: 5930/1: Add PKMAP area description to memory.txt.

2010-02-15 21:40:33 +00:00

auxdisplay

includecheck fix: Documentation, cfag12864b-example.c

2009-09-24 07:20:57 -07:00

blackfin

Blackfin: add an example showing how to use the gptimers API

2009-12-15 00:15:04 -05:00

block

Merge branch 'master' into for-2.6.34

2010-02-22 13:48:51 +01:00

blockdev

The DRBD driver

2009-10-01 21:17:49 +02:00

cdrom

debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.

2009-06-15 21:30:28 -07:00

cgroups

blkio: Documentation

2009-12-03 19:28:53 +01:00

connector

connector: Provide the sender's credentials to the callback

2009-10-02 10:54:01 -07:00

console

Typo: fro -> from

2007-07-19 10:04:47 -07:00

cpu-freq

[CPUFREQ] fix default value for ondemand governor

2010-01-13 10:55:15 -05:00

cpuidle

cpuidle: Add Documentation

2008-02-14 00:16:13 -05:00

cris

fix random typos

2008-10-16 11:21:30 -07:00

crypto

async_tx: add support for asynchronous RAID6 recovery operations

2009-08-29 19:09:27 -07:00

development-process

docs: Encourage better changelogs in the development process document

2009-06-04 10:32:49 -06:00

device-mapper

dm snapshot: add merge target

2009-12-10 23:52:30 +00:00

DocBook

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-02-28 19:23:06 -08:00

driver-model

Driver core: driver_attribute parameters can often be const*

2009-12-23 11:23:43 -08:00

dvb

V4L/DVB: get_dvb_firmware: Fix typo, sort list of components

2010-02-26 15:10:56 -03:00

early-userspace

Documentation: Remove last references to BitKeeper.

2008-04-21 22:19:05 +00:00

fault-injection

fault injection: correct function names in documentation

2010-02-02 18:11:22 -08:00

fb

viafb: documentation update

2009-12-16 07:20:05 -08:00

filesystems

rcu: 1Q2010 update for RCU documentation

2010-01-16 10:25:22 +01:00

firmware_class

driver core: fix documentation of request_firmware_nowait

2009-06-15 21:30:24 -07:00

frv

move frv docs one level up

2008-02-03 15:54:28 +02:00

hwmon

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

2010-01-11 09:45:55 -08:00

i2c

i2c: Get rid of struct i2c_client_address_data

2009-12-14 21:17:25 +01:00

i2o

documentation: convert the Documentation directory to UTF-8

2007-05-09 08:58:19 +02:00

ia64

Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS

2009-09-23 07:39:28 -07:00

ide

ide: preserve Host Protected Area by default (v2)

2009-06-07 13:52:52 +02:00

infiniband

IB: Fix typo in ipoib.txt

2009-12-09 14:21:36 -08:00

input

Merge branch 'next' into for-linus

2010-02-28 23:55:20 -08:00

ioctl

docs: large update to ioctl-number.txt

2010-01-11 09:34:04 -08:00

isdn

gigaset: small documentation improvement

2010-02-26 01:24:22 -08:00

ja_JP

block: rename CONFIG_LBD to CONFIG_LBDAF

2009-06-19 08:08:50 +02:00

kbuild

kbuild: generate modules.builtin

2009-12-12 13:08:16 +01:00

kdump

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

ko_KR

HOWTO: update misspelling and word incorrected

2007-12-17 10:33:19 -08:00

kvm

KVM: x86: Extend KVM_SET_VCPU_EVENTS with selective updates

2009-12-27 13:36:33 -02:00

laptops

thinkpad-acpi: update volume subdriver documentation

2009-12-26 22:37:58 -05:00

lguest

lguest: remove unneeded zlib.h include in example launcher

2010-02-24 14:22:22 +10:30

m68k

[SCSI] 53c7xx: fix removal fallout

2008-01-11 18:22:30 -06:00

make

Documentation/make/headers_install.txt

2007-10-17 08:43:05 -07:00

mips

ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ

2009-01-14 19:19:03 +01:00

misc-devices

ad525x_dpot: new driver for AD525x digital potentiometers

2009-12-15 08:53:25 -08:00

mn10300

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

mtd

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

namespaces

The namespaces compatibility list doc

2007-11-29 09:24:53 -08:00

netlabel

Fix occurrences of "the the "

2007-05-09 08:57:56 +02:00

networking

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

2010-02-25 23:22:42 -08:00

parisc

…

PCI

Documentation: Rename Documentation/DMA-mapping.txt

2010-01-02 10:09:44 -08:00

pcmcia

pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking

2010-02-17 17:48:24 +01:00

power

PM: Runtime PM documentation update

2009-12-22 20:43:40 +01:00

powerpc

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-02-28 19:23:06 -08:00

pps

LinuxPPS: core support

2009-06-18 13:04:04 -07:00

prctl

generic, x86: add tests for prctl PR_GET_TSC and PR_SET_TSC

2008-04-19 19:19:55 +02:00

RCU

rcu: Use canonical URL for Mathieu's dissertation

2010-02-25 10:34:56 +01:00

s390

[S390] cio: introduce cio_settle

2010-02-26 22:37:29 +01:00

scheduler

sched: Documentation/sched-rt-group: Fix style issues & bump version

2009-06-21 13:12:46 +02:00

scsi

[SCSI] megaraid_sas: version and documentation update

2010-02-17 13:13:00 -06:00

serial

tty: docs: serial/tty, add to ldisc methods

2009-12-11 15:18:05 -08:00

sh

sh: Kill off remaining CONFIG_SH_KGDB bits.

2008-12-22 18:44:05 +09:00

sound

Merge branch 'topic/hda' into for-linus

2010-03-01 12:38:54 +01:00

sparc

sparc: Remove Documentation/sparc/sbus_drivers.txt

2008-08-29 02:15:25 -07:00

spi

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

sysctl

doc: Add documentation for bootloader_{type,version}

2009-12-11 14:28:56 -08:00

telephony

remove mention of CONFIG_KMOD from documentation

2008-07-22 19:24:29 +10:00

thermal

thermal: add sanity check for the passive attribute

2009-11-05 18:18:10 -05:00

timers

fix URL in hpet.txt

2009-11-09 09:40:54 +01:00

trace

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-02-28 10:20:25 -08:00

uml

Fix typos in /Documentation : 'U-Z'

2006-11-30 04:58:40 +01:00

usb

USB: power management documentation update

2009-12-23 11:34:09 -08:00

video4linux

V4L/DVB: Documentation: gspca.txt: update known mr97310a cams

2010-02-26 15:11:09 -03:00

vm

HWPOISON: Use correct name for MADV_HWPOISON in documentation

2009-12-16 12:20:00 +01:00

w1

ds2482: Discard obsolete detect method

2009-10-04 22:53:41 +02:00

watchdog

Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS

2009-09-23 07:39:28 -07:00

wimax

i2400m: documentation and instructions for usage

2009-01-07 10:00:18 -08:00

x86

x86, numa: Remove configurable node size support for numa emulation

2010-02-15 14:34:18 -08:00

zh_CN

Chinese: add translation of Codingstyle

2008-01-24 20:40:04 -08:00

00-INDEX

Bluetooth: Add documentation for Marvell Bluetooth driver

2009-08-22 14:25:32 -07:00

applying-patches.txt

…

atomic_ops.txt

Documentation/atomic_ops.txt: fix sample code

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

bad_memory.txt

Document handling of bad memory

2008-12-03 16:09:53 -07:00

basic_profiling.txt

…

binfmt_misc.txt

documentation: convert the Documentation directory to UTF-8

2007-05-09 08:58:19 +02:00

braille-console.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

bt8xxgpio.txt

gpio: add bt8xxgpio driver

2008-07-25 10:53:30 -07:00

btmrvl.txt

Bluetooth: Add documentation for Marvell Bluetooth driver

2009-08-22 14:25:32 -07:00

BUG-HUNTING

Documentation: add hint about call traces & module symbols to BUG-HUNTING

2008-02-06 10:41:09 -08:00

cachetlb.txt

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2010-03-01 09:15:15 -08:00

Changes

netfilter: xtables: document minimal required version

2009-12-14 14:52:10 +01:00

CodingStyle

trivial: fix typo milisecond/millisecond for documentation and source comments.

2009-06-12 18:01:46 +02:00

cpu-hotplug.txt

cpumask: don't recommend set_cpus_allowed hack in Documentation/cpu-hotplug.txt

2009-12-17 11:43:29 +10:30

cpu-load.txt

[PATCH] Documentation: CPU load calculation description

2007-03-01 14:53:39 -08:00

cputopology.txt

Documentation: ABI: /sys/devices/system/cpu/cpu#/ topology files

2009-10-30 14:59:52 -07:00

credentials.txt

CRED: Documentation

2008-11-14 10:39:26 +11:00

dcdbas.txt

…

debugging-modules.txt

Documentation: Clarify when module debugging actually works.

2008-02-03 15:27:38 +02:00

debugging-via-ohci1394.txt

ieee1394: update URLs in debugging-via-ohci1394.txt

2009-10-03 09:28:11 +02:00

dell_rbu.txt

trivial: Documentation/dell_rbu.txt: fix typos

2009-06-12 18:01:50 +02:00

devices.txt

lanana: assign a device name and numbering for MAX3100

2009-04-07 08:44:05 -07:00

DMA-API.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

DMA-attributes.txt

powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU code

2008-07-22 10:39:36 +10:00

DMA-ISA-LPC.txt

Fix typos in /Documentation : 'T''

2006-11-30 04:55:36 +01:00

dmaengine.txt

async_tx, dmaengine: document channel allocation and api rework

2009-01-05 18:10:19 -07:00

dontdiff

Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig

2010-02-25 14:43:57 -08:00

dynamic-debug-howto.txt

Dynamic debug: allow simple quoting of words

2009-03-24 16:38:27 -07:00

edac.txt

fix typos/grammos in Documentation/edac.txt

2009-12-04 15:39:53 +01:00

eisa.txt

Fix typos in /Documentation : 'U-Z'

2006-11-30 04:58:40 +01:00

email-clients.txt

Documentation/email-clients.txt: add some info about gmail

2008-11-06 15:41:19 -08:00

feature-removal-schedule.txt

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-03-02 07:55:08 -08:00

flexible-arrays.txt

Update flex_arrays.txt

2009-10-15 07:25:20 -06:00

futex-requeue-pi.txt

futex: add requeue-pi documentation

2009-05-09 07:12:50 +02:00

gcov.txt

trivial: fix typo in CONFIG_DEBUG_FS in gcov doc

2009-09-21 15:14:56 +02:00

gpio.txt

gpiolib: add support for changing value polarity in sysfs

2009-12-16 07:20:01 -08:00

highuid.txt

[SPARC]: Remove SunOS and Solaris binary support.

2008-04-21 15:10:15 -07:00

HOWTO

Remove Andrew Morton's http://www.zip.com.au/~akpm/

2008-10-16 11:21:32 -07:00

hw_random.txt

hw_random doc updates

2008-03-24 19:22:19 -07:00

initrd.txt

use the newc archive format as requested by initramfs

2008-02-03 14:54:41 +02:00

intel_txt.txt

x86, intel_txt: Intel TXT boot support

2009-07-21 11:49:06 -07:00

Intel-IOMMU.txt

intel-iommu: Kill DMAR_BROKEN_GFX_WA option.

2009-09-19 09:37:23 -07:00

io_ordering.txt

…

io-mapping.txt

io mapping: improve documentation

2008-11-03 18:21:44 +01:00

IO-mapping.txt

Documentation: fix ioremap return type

2010-01-02 10:09:44 -08:00

iostats.txt

Documentation cleanup: trivial misspelling, punctuation, and grammar corrections.

2008-07-26 12:00:06 -07:00

IPMI.txt

IPMI: new NMI handling

2007-10-18 14:37:32 -07:00

IRQ-affinity.txt

genirq: Expose default irq affinity mask (take 3)

2008-06-05 15:18:30 +02:00

IRQ.txt

[PATCH] genirq: irq: document what an IRQ is

2006-06-29 10:26:25 -07:00

irqflags-tracing.txt

[PATCH] lockdep: irqtrace subsystem, docs

2006-07-03 15:27:03 -07:00

isapnp.txt

…

java.txt

Documentation/java.txt: typo and grammar fixes

2007-10-20 02:37:21 +02:00

kernel-doc-nano-HOWTO.txt

documentation: update kernel-doc-nano-HOWTO information

2010-01-11 09:34:07 -08:00

kernel-docs.txt

doc: update to URL and status of kernel-docs.txt entry

2008-06-06 11:29:10 -07:00

kernel-parameters.txt

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-02-28 19:23:06 -08:00

keys-request-key.txt

keys: allow the callout data to be passed as a blob rather than a string

2008-04-29 08:06:16 -07:00

keys.txt

KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]

2009-09-02 21:29:22 +10:00

kmemcheck.txt

kmemcheck: update documentation

2009-07-01 22:36:22 +02:00

kmemleak.txt

kmemleak: add clear command support

2009-09-08 16:36:08 +01:00

kobject.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

kprobes.txt

debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.

2009-06-15 21:30:28 -07:00

kref.txt

kref: double kref_put() in my_data_handler()

2009-09-18 09:48:52 -07:00

ldm.txt

LDM: Fix for Windows Vista dynamic disks

2007-05-21 09:58:40 -07:00

leds-class.txt

led: document sysfs interface

2009-08-28 15:21:12 -04:00

leds-lp3944.txt

leds: LED driver for National Semiconductor LP3944 Funlight Chip

2009-06-23 20:21:38 +01:00

local_ops.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

lockdep-design.txt

lockdep: Fix typos in documentation

2009-08-07 12:03:46 +02:00

lockstat.txt

lockstat: Add usage info to Documentation/lockstat.txt

2009-12-06 13:20:02 +01:00

logo.gif

Revert "linux.conf.au 2009: Tuz"

2009-04-27 12:00:27 -07:00

logo.txt

Revert "linux.conf.au 2009: Tuz"

2009-04-27 12:00:27 -07:00

magic-number.txt

documentation: update header file paths

2009-01-06 15:59:28 -08:00

Makefile

docsrc: build Documentation/ sources

2008-08-12 16:07:30 -07:00

ManagementStyle

docs: fix ManagementStyle book name

2008-10-30 11:38:46 -07:00

mca.txt

The ps2esdi driver was marked as BROKEN more than two years ago due to being

2008-03-17 09:03:05 +01:00

md.txt

md: add 'recovery_start' per-device sysfs attribute

2009-12-14 12:58:57 +11:00

memory-barriers.txt

sched: Document memory barriers implied by sleep/wake-up primitives

2009-04-29 14:15:55 +02:00

memory-hotplug.txt

mm: add numa node symlink for memory section in sysfs

2009-12-15 08:53:17 -08:00

memory.txt

Documentation/memory.txt: remove some very outdated recommendations

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

mono.txt

Fix "can not" in Documentation and Kconfig

2006-10-03 22:53:09 +02:00

mutex-design.txt

Documentation: Add nested versions of mutex locks to docs

2007-10-20 00:15:26 +02:00

nmi_watchdog.txt

x86, nmi-watchdog: update procfs nmi_watchdog file documentation v2

2008-10-30 19:07:04 +01:00

nommu-mmap.txt

nommu: fix malloc performance by adding uninitialized flag

2009-12-15 08:53:24 -08:00

numastat.txt

mm: fix NUMA accounting in numastat.txt

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

oops-tracing.txt

docs: Describe the 'C' taint flag in oops-tracing.txt

2009-11-09 09:40:56 +01:00

parport-lowlevel.txt

plip: fix parport_register_device name parameter

2007-11-26 19:39:01 -08:00

parport.txt

…

pi-futex.txt

fix a typo in Documentation/pi-futex.txt

2006-10-03 23:39:02 +02:00

pnp.txt

Documentation: Replace obsolete "driverfs" with "sysfs".

2008-01-24 20:40:04 -08:00

preempt-locking.txt

…

printk-formats.txt

DOC: add printk-formats.txt

2008-11-12 17:17:17 -08:00

prio_tree.txt

Documentation: remove duplicated words

2006-10-03 22:57:56 +02:00

rbtree.txt

trivial: rbtree.txt: fix rb_entry() parameters in sample code

2009-06-12 18:01:47 +02:00

rfkill.txt

rfkill: export persistent attribute in sysfs

2009-06-19 11:50:18 -04:00

robust-futex-ABI.txt

futex: documentation: fix inconsistent description of futex list_op_pending

2009-06-18 13:03:56 -07:00

robust-futexes.txt

Fix typos in /Documentation : Misc

2006-11-30 05:21:10 +01:00

rt-mutex-design.txt

[PATCH] typo fixes for rt-mutex-design.txt

2006-10-01 00:39:24 -07:00

rt-mutex.txt

[PATCH] pi-futex: rt mutex docs

2006-06-27 17:32:47 -07:00

rtc.txt

rtc: add boot_timesource sysfs attribute

2009-09-23 07:39:46 -07:00

SAK.txt

Remove Andrew Morton's old email accounts

2008-10-16 11:21:32 -07:00

SecurityBugs

…

SELinux.txt

selinux: add support for installing a dummy policy (v2)

2008-08-27 08:54:08 +10:00

serial-console.txt

[PATCH] doc: more serial-console info

2006-03-25 08:23:00 -08:00

sgi-ioc4.txt

…

sgi-visws.txt

…

slow-work.txt

SLOW_WORK: Move slow_work's proc file to debugfs

2009-12-01 08:20:31 -08:00

SM501.txt

trivial: Miscellaneous documentation typo fixes

2009-06-12 18:01:47 +02:00

Smack.txt

smack: implement logging V3

2009-04-14 09:00:23 +10:00

sparse.txt

Documentation: explain the difference between __bitwise and __bitwise__

2009-04-11 08:18:11 +02:00

spinlocks.txt

Documentation: rw_lock lessons learned

2009-12-14 09:46:56 -08:00

stable_api_nonsense.txt

stable_api_nonsense.txt: Disambiguate the use of "this" by using "that" to refer to the syscall interface

2007-07-30 14:25:12 -07:00

stable_kernel_rules.txt

Doc/stable rules: add new cherry-pick logic

2009-12-23 11:23:43 -08:00

SubmitChecklist

doc: SubmitChecklist, add ioctls, remove OSDL reference

2009-12-16 07:20:06 -08:00

SubmittingDrivers

Remove Andrew Morton's old email accounts

2008-10-16 11:21:32 -07:00

SubmittingPatches

docs: update patch size in SubmittingPatches

2009-10-01 16:11:12 -07:00

svga.txt

…

sysfs-rules.txt

Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense

2009-05-08 19:22:20 -07:00

sysrq.txt

sysrq, kdump: make sysrq-c consistent

2009-07-29 19:10:36 -07:00

tomoyo.txt

tomoyo: add Documentation/tomoyo.txt

2009-04-14 09:14:58 +10:00

unaligned-memory-access.txt

introduce HAVE_EFFICIENT_UNALIGNED_ACCESS Kconfig symbol

2008-07-25 10:53:27 -07:00

unicode.txt

…

unshare.txt

Documentation: remove duplicated words

2006-10-03 22:57:56 +02:00

VGA-softcursor.txt

…

vgaarbiter.txt

vgaarbiter: fix a typo in the vgaarbiter Documentation

2009-12-16 11:28:58 -08:00

video-output.txt

output: Add output class document

2006-12-20 01:46:58 -05:00

volatile-considered-harmful.txt

Documentation cleanup: trivial misspelling, punctuation, and grammar corrections.

2008-07-26 12:00:06 -07:00

voyager.txt

…

zorro.txt

…