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
accounting
acpi	ACPI, APEI, Add PCIe AER error information printing support	2011-03-21 22:59:08 -04:00
aoe
arm	Fix common misspellings	2011-03-31 11:26:23 -03:00
auxdisplay
blackfin
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
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
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
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
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
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
ko_KR
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
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
namespaces
netlabel
networking	bonding: documentation and code cleanup for resend_igmp	2011-05-25 17:55:33 -04:00
nfc
parisc
PCI	Fix common misspellings	2011-03-31 11:26:23 -03:00
pcmcia
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
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
RCU	Revert "rcu: Decrease memory-barrier usage based on semi-formal proof"	2011-05-19 23:25:29 +02: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
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
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
apparmor.txt
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt	mm: convert mm->cpu_vm_cpumask into cpumask_var_t	2011-05-25 08:39:21 -07:00
Changes	Documentation/Changes: minor corrections	2011-03-22 17:44:17 -07:00
circular-buffers.txt
coccinelle.txt
CodingStyle	Documentation/CodingStyle: flesh out if-else examples	2011-03-22 17:44:16 -07:00
cpu-hotplug.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
cpu-load.txt
cputopology.txt
credentials.txt
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
DMA-API-HOWTO.txt
DMA-API.txt
DMA-attributes.txt
DMA-ISA-LPC.txt
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
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
highuid.txt
HOWTO	Documentation: update LXR web link	2011-05-23 15:14:11 -07:00
hw_random.txt
hwspinlock.txt	drivers: hwspinlock: add framework	2011-02-17 09:52:03 -08:00
init.txt
initrd.txt
intel_txt.txt
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
iostats.txt	Documentation/iostats.txt: bit-size reference etc.	2011-03-23 20:44:18 +01:00
IPMI.txt
IRQ-affinity.txt	bitmap, irq: add smp_affinity_list interface to /proc/irq	2011-05-25 08:39:45 -07:00
IRQ.txt
irqflags-tracing.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt
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.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
kref.txt	kref: Fix typo in kref documentation	2011-03-07 13:20:05 -08:00
ldm.txt
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
Makefile
ManagementStyle
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
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt
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
SAK.txt
SecurityBugs	Fix common misspellings	2011-03-31 11:26:23 -03:00
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
Smack.txt
sparse.txt
spinlocks.txt
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
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
svga.txt
sysfs-rules.txt
sysrq.txt
tomoyo.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.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
zorro.txt