Linus Torvalds f8965467f3 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: (1674 commits) qlcnic: adding co maintainer ixgbe: add support for active DA cables ixgbe: dcb, do not tag tc_prio_control frames ixgbe: fix ixgbe_tx_is_paused logic ixgbe: always enable vlan strip/insert when DCB is enabled ixgbe: remove some redundant code in setting FCoE FIP filter ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp ixgbe: fix header len when unsplit packet overflows to data buffer ipv6: Never schedule DAD timer on dead address ipv6: Use POSTDAD state ipv6: Use state_lock to protect ifa state ipv6: Replace inet6_ifaddr->dead with state cxgb4: notify upper drivers if the device is already up when they load cxgb4: keep interrupts available when the ports are brought down cxgb4: fix initial addition of MAC address cnic: Return SPQ credit to bnx2x after ring setup and shutdown. cnic: Convert cnic_local_flags to atomic ops. can: Fix SJA1000 command register writes on SMP systems bridge: fix build for CONFIG_SYSFS disabled ARCNET: Limit com20020 PCI ID matches for SOHARD cards ... Fix up various conflicts with pcmcia tree drivers/net/ {pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and wireless/orinoco/spectrum_cs.c} and feature removal (Documentation/feature-removal-schedule.txt). Also fix a non-content conflict due to pm_qos_requirement getting renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c		2010-05-20 21:04:44 -07:00
..
ABI	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
accounting
acpi
aoe
arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
auxdisplay
blackfin	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
block	Documentation: fix block/biodoc.txt dma mapping description	2010-03-08 09:11:07 +01:00
blockdev
cdrom
cgroups	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
connector	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
console
cpu-freq
cpuidle
cris
crypto
development-process
device-mapper	dm: document when snapshot has finished merging	2010-03-06 02:29:56 +00:00
DocBook	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
driver-model
dvb	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
early-userspace
fault-injection	lkdtm: add debugfs access and loosen KPROBE ties	2010-03-06 11:26:32 -08:00
fb	fbdev: rename imacfb.txt to efifb.txt and change imacfb to efifb.	2010-04-07 08:38:02 -07:00
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
firmware_class
frv
hwmon	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
i2c	i2c-core: Erase pointer to clientdata on removal	2010-05-04 11:09:27 +02:00
i2o
ia64
ide
infiniband
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
ioctl	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2010-03-19 09:43:06 -07:00
isdn
ja_JP
kbuild	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
kdump
ko_KR
kvm	KVM: trivial document fixes	2010-03-01 12:35:43 -03:00
laptops	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
lguest	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
m68k
make
mips
misc-devices
mn10300
mtd
namespaces
netlabel	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
networking	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
parisc
PCI	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
pcmcia	pcmcia: dev_node removal (core)	2010-05-10 10:23:17 +02:00
power	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
powerpc	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
pps
prctl
RCU	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-18 08:27:54 -07:00
s390	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
scheduler	sched: Remove USER_SCHED from documentation	2010-04-02 20:12:01 +02:00
scsi	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
serial	ldisc: new dcd_change() method for line disciplines	2010-03-12 15:52:43 -08:00
sh
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
sparc
spi	spi: spidev_test gives error upon 1-byte transfer	2010-04-29 16:40:30 -06:00
sysctl	net: Consistent skb timestamping	2010-05-15 23:57:10 -07:00
telephony
thermal
timers	Documentation/timers/: split txt and source files	2010-03-12 15:52:35 -08:00
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
uml
usb	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
video4linux	V4L/DVB: saa7134: Add support new Behold TV cards	2010-05-19 12:58:41 -03:00
vm	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
w1	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
watchdog	[WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl.	2010-04-06 14:23:55 +00:00
wimax
x86
zh_CN
00-INDEX	Add a document describing the padata interface	2010-05-14 09:18:55 -06:00
applying-patches.txt
atomic_ops.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
cachetlb.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
Changes	netfilter: xtables: remove xt_string revision 0	2010-03-25 17:04:57 +01:00
circular-buffers.txt	Document Linux's circular buffering capabilities	2010-03-24 16:31:22 -07:00
CodingStyle
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
credentials.txt	CRED: Holding a spinlock does not imply the holding of RCU read lock	2010-04-27 08:49:03 +10:00
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt
DMA-API-HOWTO.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
DMA-API.txt	Documentation: rename PCI-DMA-mapping.txt to DMA-API-HOWTO.txt	2010-03-12 15:52:43 -08:00
DMA-attributes.txt
DMA-ISA-LPC.txt
dmaengine.txt
dontdiff
dynamic-debug-howto.txt
edac.txt
eisa.txt
email-clients.txt	Documentation/email-clients.txt: update gmail information	2010-03-12 15:52:35 -08:00
feature-removal-schedule.txt	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt	gpio: introduce gpio_request_one() and friends	2010-03-06 11:26:48 -08:00
highuid.txt
HOWTO	Documentation/HOWTO: update git home URL	2010-04-22 15:24:56 -07:00
hw_random.txt
init.txt	init/main.c: improve usability in case of init binary failure	2010-03-06 11:26:29 -08:00
initrd.txt
intel_txt.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
IO-mapping.txt
iostats.txt
IPMI.txt	ipmi: add parameter to limit CPU usage in kipmid	2010-03-12 15:52:39 -08:00
IRQ-affinity.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
kernel-parameters.txt	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-05-20 09:45:38 -07:00
keys-request-key.txt
keys.txt
kmemcheck.txt
kmemleak.txt
kobject.txt	kobject: documentation: Update to refer to kset-example.c.	2010-03-19 07:12:20 -07:00
kprobes.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
kref.txt
ldm.txt
leds-class.txt
leds-lp3944.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
logo.gif
logo.txt
magic-number.txt
Makefile	Documentation/fs/: split txt and source files	2010-03-12 15:52:35 -08:00
ManagementStyle
mca.txt
md.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
memory-barriers.txt	Document Linux's circular buffering capabilities	2010-03-24 16:31:22 -07:00
memory-hotplug.txt
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt	Add a document describing the padata interface	2010-05-14 09:18:55 -06:00
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt
rfkill.txt	Document the rfkill sysfs ABI	2010-03-10 17:09:33 -05:00
robust-futex-ABI.txt
robust-futexes.txt
rt-mutex-design.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
slow-work.txt
SM501.txt
Smack.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
sparse.txt	doc: Change urls for sparse	2010-04-27 22:59:07 +02:00
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt	Documentation: -stable rules: upstream commit ID requirement reworded	2010-04-22 15:24:56 -07:00
SubmitChecklist	Documentation/SubmitChecklist: add rule #1	2010-03-12 15:52:35 -08:00
SubmittingDrivers
SubmittingPatches
svga.txt
sysfs-rules.txt	Fix typos in comments	2010-03-16 11:47:56 +01:00
sysrq.txt	Input: Documentation/sysrq.txt - update KEY_SYSRQ info	2010-05-19 10:14:15 -07:00
tomoyo.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
volatile-considered-harmful.txt	Documentation/volatile-considered-harmful.txt: correct cpu_relax() documentation	2010-03-24 16:31:20 -07:00
zorro.txt