Linus Torvalds 3f5785ec31 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits) bonding: documentation and code cleanup for resend_igmp bonding: prevent deadlock on slave store with alb mode (v3) net: hold rtnl again in dump callbacks Add Fujitsu 1000base-SX PCI ID to tg3 bnx2x: protect sequence increment with mutex sch_sfq: fix peek() implementation isdn: netjet - blacklist Digium TDM400P via-velocity: don't annotate MAC registers as packed xen: netfront: hold RTNL when updating features. sctp: fix memory leak of the ASCONF queue when free asoc net: make dev_disable_lro use physical device if passed a vlan dev (v2) net: move is_vlan_dev into public header file (v2) bug.h: Fix build with CONFIG_PRINTK disabled. wireless: fix fatal kernel-doc error + warning in mac80211.h wireless: fix cfg80211.h new kernel-doc warnings iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled dst: catch uninitialized metrics be2net: hash key for rss-config cmd not set bridge: initialize fake_rtable metrics net: fix __dst_destroy_metrics_generic() ... Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c		2011-05-25 17:00:17 -07:00
..
ABI	Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-block	2011-05-25 09:14:07 -07:00
DocBook	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-05-24 13:31:37 -07:00
PCI	Fix common misspellings	2011-03-31 11:26:23 -03:00
RCU	Revert "rcu: Decrease memory-barrier usage based on semi-formal proof"	2011-05-19 23:25:29 +02:00
accounting	taskstats: pad taskstats netlink response for aligment issues on ia64	2010-12-22 19:43:34 -08:00
acpi	ACPI, APEI, Add PCIe AER error information printing support	2011-03-21 22:59:08 -04:00
aoe	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
arm	Fix common misspellings	2011-03-31 11:26:23 -03:00
auxdisplay	…
blackfin	Blackfin: document SPI CS limitations with CPHA=0	2010-08-06 12:55:52 -04:00
block	Fix common misspellings	2011-03-31 11:26:23 -03:00
blockdev	cciss: add cciss_tape_cmds module paramter	2011-05-06 08:23:59 -06:00
cdrom	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
cgroups	memcg: update documentation to describe usage_in_bytes	2011-04-28 11:28:21 -07:00
connector	…
console	…
cpu-freq	[CPUFREQ] Add documentation for sampling_down_factor	2011-03-16 17:54:31 -04:00
cpuidle	…
cris	…
crypto	…
development-process	docs: update the development process document	2011-03-25 14:30:31 -06:00
device-mapper	Fix common misspellings	2011-03-31 11:26:23 -03:00
devicetree	Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-25 08:59:42 -07:00
driver-model	driver core: remove the driver-model structures from the documentation	2011-05-06 18:01:05 -07:00
dvb	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
early-userspace	…
fault-injection	…
fb	Fix common misspellings	2011-03-31 11:26:23 -03:00
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs	2011-05-25 09:21:56 -07:00
firmware_class	firmware: Update hotplug script	2010-08-05 13:53:34 -07:00
frv	…
hid	HID: Move hiddev.txt to the new Documentation/hid directory	2011-03-22 11:43:51 +01:00
hwmon	hwmon: New driver for the SMSC EMC6W201	2011-05-25 20:43:33 +02:00
i2c	i2c-i801: SMBus patch for Intel Panther Point DeviceIDs	2011-05-24 20:58:49 +02:00
i2o	Fix common misspellings	2011-03-31 11:26:23 -03:00
ia64	Fix common misspellings	2011-03-31 11:26:23 -03:00
ide	…
infiniband	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
input	Input: elantech - describe further the protocol	2011-05-16 22:48:24 -07:00
ioctl	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc	2011-05-25 16:55:55 -07:00
isdn	Fix common misspellings	2011-03-31 11:26:23 -03:00
ja_JP	HOWTO: sync up Documentaion/ja_JP/HOWTO	2011-04-19 16:53:45 -07:00
kbuild	Merge branch 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-05-25 16:54:01 -07:00
kdump	kdump: update kexec-tools URL and Vivek's email	2010-11-25 14:36:38 +01:00
ko_KR	Docs/Kconfig: Update: osdl.org -> linuxfoundation.org	2010-11-15 23:50:13 +01:00
laptops	Documentation: fix minor typos/spelling	2011-04-04 17:51:47 -07:00
leds	Documentation: consolidate leds files to leds/ subdir	2011-04-04 17:51:47 -07:00
m68k	…
make	kbuild: introduce HDR_ARCH_LIST for headers_install_all	2010-12-14 22:16:19 +01:00
mips	Fix common misspellings	2011-03-31 11:26:23 -03:00
misc-devices	Fix common misspellings	2011-03-31 11:26:23 -03:00
mmc	mmc: MMC boot partitions support.	2011-05-24 21:01:21 -04:00
mn10300	…
mtd	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
namespaces	…
netlabel	…
networking	bonding: documentation and code cleanup for resend_igmp	2011-05-25 17:55:33 -04:00
nfc	NFC: Driver for NXP Semiconductors PN544 NFC chip.	2011-01-13 08:03:19 -08:00
parisc	…
pcmcia	pcmcia: use autoconfiguration feature for ioports and iomem	2010-09-29 17:20:24 +02:00
power	PM: Allow drivers to allocate memory from .prepare() callbacks safely	2011-05-17 23:26:00 +02:00
powerpc	Fix common misspellings	2011-03-31 11:26:23 -03:00
pps	pps: add parallel port PPS signal generator	2011-01-13 08:03:21 -08:00
prctl	…
pti	Kernel documentation for the PTI feature.	2011-05-13 16:31:00 -07:00
ptp	ptp: Added a brand new class driver for ptp clocks.	2011-05-23 13:01:00 -07:00
rapidio	rapidio: add RapidIO documentation	2011-03-23 19:46:41 -07:00
s390	Documentation: fix minor typos/spelling	2011-04-04 17:51:47 -07:00
scheduler	sched, doc: Beef up load balancing description	2011-03-31 13:00:35 +02:00
scsi	[SCSI] qla2xxx: Update License file.	2011-05-01 10:07:14 -05:00
serial	Fix common misspellings	2011-03-31 11:26:23 -03:00
sh	sh: clkfwk: Kill off unused clk_set_rate_ex().	2010-11-15 18:25:12 +09:00
sound	Merge branch 'topic/hda' into for-linus	2011-05-22 10:01:35 +02:00
sparc	…
spi	Fix common misspellings	2011-03-31 11:26:23 -03:00
sysctl	Documentation: update epoll sysctl text	2011-05-23 15:14:11 -07:00
target	[SCSI] tcm_mod_builder.py: Fix generated *_drop_nodeacl() handler	2011-03-23 11:36:45 -05:00
telephony	Fix common misspellings	2011-03-31 11:26:23 -03:00
thermal	thermal: Add event notification to thermal framework	2011-01-12 00:08:35 -05:00
timers	doc: timers-howto: fix a typo ("unsgined")	2011-05-17 10:52:02 +02:00
trace	sched: Get rid of lock_depth	2011-04-24 13:18:38 +02:00
usb	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-05-23 12:33:02 -07:00
video4linux	[media] uvcvideo: Add driver documentation	2011-05-20 09:30:36 -03:00
virtual	um: add ucast ethernet transport	2011-05-25 08:39:41 -07:00
vm	mm: Convert i_mmap_lock to a mutex	2011-05-25 08:39:18 -07:00
w1	Fix common misspellings	2011-03-31 11:26:23 -03:00
watchdog	Fix common misspellings	2011-03-31 11:26:23 -03:00
wimax	…
x86	x86, gart: Rename pci-gart_64.c to amd_gart_64.c	2011-05-10 17:22:06 +02:00
zh_CN	Translated Documentation/email-clients.txt	2011-05-06 17:59:20 -07:00
.gitignore	…
00-INDEX	Add a 00-INDEX file to Documentation/virtual	2011-05-06 09:23:23 -07:00
BUG-HUNTING	…
Changes	Documentation/Changes: minor corrections	2011-03-22 17:44:17 -07:00
CodingStyle	Documentation/CodingStyle: flesh out if-else examples	2011-03-22 17:44:16 -07:00
DMA-API-HOWTO.txt	Documentation: DMA-API-HOWTO.txt: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN	2010-08-14 11:56:46 -07:00
DMA-API.txt	dma-mapping: remove dma_is_consistent API	2010-08-11 08:59:21 -07:00
DMA-ISA-LPC.txt	…
DMA-attributes.txt	…
HOWTO	Documentation: update LXR web link	2011-05-23 15:14:11 -07:00
IPMI.txt	IPMI: Add the document description of ipmi_get_smi_info	2010-12-14 00:22:00 -05:00
IRQ-affinity.txt	bitmap, irq: add smp_affinity_list interface to /proc/irq	2011-05-25 08:39:45 -07:00
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	[media] Remove the old V4L1 v4lgrab.c file	2010-12-29 08:17:12 -02:00
ManagementStyle	…
SAK.txt	…
SELinux.txt	…
SM501.txt	…
SecurityBugs	Fix common misspellings	2011-03-31 11:26:23 -03:00
Smack.txt	…
SubmitChecklist	…
SubmittingDrivers	Fix common misspellings	2011-03-31 11:26:23 -03:00
SubmittingPatches	Documentation: update GregKH links	2011-05-23 15:14:11 -07:00
VGA-softcursor.txt	…
apparmor.txt	AppArmor: update Maintainer and Documentation	2010-08-02 15:35:15 +10:00
applying-patches.txt	…
atomic_ops.txt	…
bad_memory.txt	…
basic_profiling.txt	…
binfmt_misc.txt	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	documentation: fix almost duplicate filenames (IO/io-mapping.txt)	2010-07-20 17:49:30 +00:00
cachetlb.txt	mm: convert mm->cpu_vm_cpumask into cpumask_var_t	2011-05-25 08:39:21 -07:00
circular-buffers.txt	…
coccinelle.txt	scripts/coccinelle: update for compatability with Coccinelle 0.2.4	2010-12-03 12:27:01 +01:00
cpu-hotplug.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
cpu-load.txt	…
cputopology.txt	topology/sysfs: Provide book id and siblings attributes	2010-09-09 20:41:25 +02:00
credentials.txt	CRED: Fix __task_cred()'s lockdep check and banner comment	2010-07-29 15:16:18 -07:00
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
devices.txt	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-10-28 09:35:11 -07:00
dmaengine.txt	…
dontdiff	Documentation: update dontdiff file	2011-05-23 15:14:11 -07:00
dynamic-debug-howto.txt	Merge branch 'docs-next' of git://git.lwn.net/linux-2.6	2011-03-27 19:46:59 -07:00
edac.txt	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
eisa.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
email-clients.txt	Documentation/email-clients.txt: update Thunderbird docs with wordwrap plugin	2011-01-13 08:03:15 -08:00
feature-removal-schedule.txt	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-05-23 21:12:49 -07:00
flexible-arrays.txt	flex_array: flex_array_prealloc takes a number of elements, not an end	2011-04-28 16:12:47 -04:00
futex-requeue-pi.txt	…
gcov.txt	…
gpio.txt	Revert "gpiolib: annotate gpio-intialization with __must_check"	2011-01-13 17:26:46 -08:00
highuid.txt	…
hw_random.txt	…
hwspinlock.txt	drivers: hwspinlock: add framework	2011-02-17 09:52:03 -08:00
init.txt	…
initrd.txt	…
intel_txt.txt	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	Documentation/iostats.txt: bit-size reference etc.	2011-03-23 20:44:18 +01:00
irqflags-tracing.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	docbook: warn on unused doc entries	2010-09-11 16:49:21 -07:00
kernel-docs.txt	Documentation: update kernel-docs.txt	2011-01-06 09:59:38 -08:00
kernel-parameters.txt	memsw: remove noswapaccount kernel parameter	2011-05-25 08:39:36 -07:00
keys-request-key.txt	KEYS: Add a new keyctl op to reject a key with a specified error code	2011-03-08 11:17:18 +11:00
keys-trusted-encrypted.txt	keys: add new trusted key-type	2010-11-29 08:55:25 +11:00
keys.txt	KEYS: Add an iovec version of KEYCTL_INSTANTIATE	2011-03-08 11:17:22 +11:00
kmemcheck.txt	…
kmemleak.txt	Documentation: update kmemleak arch. info	2011-04-04 17:51:46 -07:00
kobject.txt	…
kprobes.txt	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
kref.txt	kref: Fix typo in kref documentation	2011-03-07 13:20:05 -08:00
ldm.txt	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
local_ops.txt	…
lockdep-design.txt	…
lockstat.txt	mm: Convert i_mmap_lock to a mutex	2011-05-25 08:39:18 -07:00
logo.gif	…
logo.txt	…
magic-number.txt	take coda-private headers out of include/linux	2011-01-12 20:02:48 -05:00
mca.txt	…
md.txt	md: Update documentation for sync_min and sync_max entries	2011-04-20 15:40:01 +10:00
media-framework.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
memory-barriers.txt	smp: Document transitivity for memory barriers.	2011-03-04 08:05:49 -08:00
memory-hotplug.txt	memory hotplug: Allow memory blocks to span multiple memory sections	2011-02-03 16:08:57 -08:00
memory.txt	…
mono.txt	…
mutex-design.txt	mutex: Fix annotations to include it in kernel-locking docbook	2010-09-03 08:19:51 +02:00
nmi_watchdog.txt	…
nommu-mmap.txt	…
numastat.txt	…
oops-tracing.txt	…
padata.txt	Documentation/padata.txt: fix typos etc.	2010-08-11 08:59:18 -07:00
parport-lowlevel.txt	…
parport.txt	…
pi-futex.txt	…
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	…
prio_tree.txt	…
rbtree.txt	Documentation: remove anticipatory scheduler info	2010-11-11 12:09:59 +01:00
rfkill.txt	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rt-mutex-design.txt	…
rt-mutex.txt	…
rtc.txt	RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer	2011-03-09 11:25:10 -08:00
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
sparse.txt	update email address	2010-07-19 10:56:54 +02:00
spinlocks.txt	locking: Remove deprecated lock initializers	2011-01-27 12:30:38 +01:00
stable_api_nonsense.txt	doc: stable_api_nonsense.txt: fix paragraph to make more sense.	2011-03-30 12:02:05 +02:00
stable_kernel_rules.txt	…
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	documentation: update sysrq.txt magic sysrq keys	2010-10-26 17:32:41 -07:00
tomoyo.txt	TOMOYO: Update version to 2.3.0	2010-08-02 15:35:10 +10:00
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vgaarbiter.txt	Documentation: fix vgaarbiter.txt typos etc.	2011-05-23 15:14:11 -07:00
video-output.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	workqueue: Document debugging tricks	2011-03-31 13:40:42 +02:00
xz.txt	decompressors: add XZ decompressor module	2011-01-13 08:03:24 -08:00
zorro.txt	…