Linus Torvalds a01af8e4a4 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: (27 commits) af_unix: limit recursion level pch_gbe driver: The wrong of initializer entry pch_gbe dreiver: chang author ucc_geth: fix ucc halt problem in half duplex mode inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners ehea: Add some info messages and fix an issue hso: fix disable_net NET: wan/x25_asy, move lapb_unregister to x25_asy_close_tty cxgb4vf: fix setting unicast/multicast addresses ... net, ppp: Report correct error code if unit allocation failed DECnet: don't leak uninitialized stack byte au1000_eth: fix invalid address accessing the MAC enable register dccp: fix error in updating the GAR tcp: restrict net.ipv4.tcp_adv_win_scale (#20312) netns: Don't leak others' openreq-s in proc Net: ceph: Makefile: Remove unnessary code vhost/net: fix rcu check usage econet: fix CVE-2010-3848 econet: fix CVE-2010-3850 econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849 ...		2010-11-29 14:36:33 -08:00
..
ABI	oom: document obsolete oom_adj tunable	2010-11-12 07:55:31 -08:00
DocBook	Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-11-25 06:58:19 +09:00
PCI	Documentation: pci.txt: fix typo	2010-07-11 22:17:45 +02:00
RCU	rcu: Add tracing data to support queueing models	2010-09-23 09:16:53 -07:00
accounting	delay-accounting: reimplement -c for getdelays.c to report information on a target command	2010-10-27 18:03:17 -07:00
acpi	ACPI: introduce module parameter acpi.aml_debug_output	2010-08-14 23:02:14 -04:00
aoe	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
arm	OMAP: DSS: Fix documentation regarding 'vram' kernel parameter	2010-11-10 20:51:14 +09:00
auxdisplay	…
blackfin	Blackfin: document SPI CS limitations with CPHA=0	2010-08-06 12:55:52 -04:00
block	Documentation: remove anticipatory scheduler info	2010-11-11 12:09:59 +01:00
blockdev	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
cdrom	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
cgroups	cgroup: add clone_children control file	2010-10-27 18:03:09 -07:00
connector	…
console	…
cpu-freq	…
cpuidle	…
cris	…
crypto	…
development-process	Documentation/development-process: more staging info	2010-11-18 15:00:47 -08:00
device-mapper	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
driver-model	…
dvb	[media] lmedm04: driver for DM04/QQBOX updated to version 1.60	2010-10-22 22:22:47 -02:00
early-userspace	…
fault-injection	…
fb	fbdev: Update documentation index file.	2010-11-18 15:01:54 +09:00
filesystems	Documentation: make configfs example code simpler, clearer	2010-11-18 15:00:46 -08:00
firmware_class	firmware: Update hotplug script	2010-08-05 13:53:34 -07:00
frv	…
hwmon	Documentation: change email address for Hans Koch	2010-11-18 15:00:46 -08:00
i2c	i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers	2010-10-31 21:07:00 +01:00
i2o	…
ia64	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
ide	…
infiniband	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
input	HID: ntrig: add documention	2010-08-30 15:25:18 +02:00
ioctl	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2010-10-28 12:13:00 -07:00
isdn	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
ja_JP	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
kbuild	Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:18:59 -07:00
kdump	…
ko_KR	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
kvm	KVM: Document that KVM_GET_SUPPORTED_CPUID may return emulated values	2010-10-24 10:52:48 +02:00
laptops	thinkpad-acpi: untangle ACPI/vendor backlight selection	2010-08-16 11:54:50 -04:00
leds	Documentation: led drivers lp5521 and lp5523	2010-11-12 07:55:32 -08:00
lguest	Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier	2010-10-19 09:13:04 +02:00
m68k	…
make	…
mips	…
misc-devices	Documentation: short descriptions for bh1770glc and apds990x drivers	2010-10-26 16:52:14 -07:00
mmc	mmc: add erase, secure erase, trim and secure trim operations	2010-08-12 08:43:30 -07:00
mn10300	…
mtd	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
namespaces	…
netlabel	…
networking	tcp: restrict net.ipv4.tcp_adv_win_scale (#20312)	2010-11-28 10:39:45 -08:00
parisc	…
pcmcia	pcmcia: use autoconfiguration feature for ioports and iomem	2010-09-29 17:20:24 +02:00
power	PM / OPP: Hide OPP configuration when SoCs do not provide an implementation	2010-11-11 01:51:26 +01:00
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-10-22 20:30:48 -07:00
pps	…
prctl	…
s390	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
scheduler	…
scsi	[SCSI] megaraid_sas: Version and documentation update	2010-10-26 11:11:12 -05:00
serial	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02: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	2010-10-25 10:40:05 +02:00
sparc	…
spi	spi/ep93xx: implemented driver for Cirrus EP93xx SPI controller	2010-05-25 00:23:16 -06:00
sysctl	Restrict unprivileged access to kernel syslog	2010-11-12 07:55:32 -08:00
telephony	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
thermal	…
timers	Documentation/timers/hpet_example.c: add supporting info for hpet_example	2010-10-26 16:52:11 -07:00
trace	tracing, vmscan: add trace events for LRU list shrinking	2010-10-26 16:52:07 -07:00
uml	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
usb	USB: teach "devices" file about Wireless and SuperSpeed USB	2010-10-22 10:21:40 -07:00
video4linux	[media] Support for Elgato Video Capture	2010-10-22 20:55:43 -02:00
vm	mm: highmem documentation	2010-10-26 16:52:08 -07:00
w1	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
watchdog	watchdog: docs: add an entry for imx2_wdt	2010-07-01 16:02:55 +00:00
wimax	…
x86	Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-10-22 08:54:21 -07:00
zh_CN	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
.gitignore	…
00-INDEX	mmc: add erase, secure erase, trim and secure trim operations	2010-08-12 08:43:30 -07:00
BUG-HUNTING	…
Changes	Documentation update broken web addresses	2010-07-11 21:55:42 +02:00
CodingStyle	…
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 broken web addresses.	2010-08-04 15:21:40 +02:00
IPMI.txt	…
IRQ-affinity.txt	…
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	…
ManagementStyle	…
SAK.txt	…
SELinux.txt	…
SM501.txt	…
SecurityBugs	…
Smack.txt	…
SubmitChecklist	Documentation: update SubmitChecklist for O=objdir and kconfig testing	2010-05-24 07:31:20 -07:00
SubmittingDrivers	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
SubmittingPatches	SubmittingPatches: add more about patch descriptions	2010-08-09 20:45:05 -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	…
circular-buffers.txt	…
coccinelle.txt	Coccinelle: Fix documentation	2010-10-28 00:32:23 +02:00
cpu-hotplug.txt	documentation: fix erroneous email address.	2010-08-11 23:04:10 +09:30
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	…
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	…
dynamic-debug-howto.txt	Dynamic Debug: Introduce ddebug_query= boot parameter	2010-10-22 10:16:42 -07:00
edac.txt	EDAC: Fix typos in Documentation/edac.txt	2010-11-25 17:32:47 +01:00
eisa.txt	…
email-clients.txt	…
feature-removal-schedule.txt	i2c: Mark i2c_adapter.id as deprecated	2010-11-15 22:40:38 +01:00
flexible-arrays.txt	…
futex-requeue-pi.txt	…
gcov.txt	…
gpio.txt	Documentation/gpio.txt: explain poll/select usage	2010-11-18 15:00:46 -08:00
highuid.txt	…
hw_random.txt	…
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	…
irqflags-tracing.txt	…
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 broken web addresses.	2010-08-04 15:21:40 +02:00
kernel-parameters.txt	cgroups: make swap accounting default behavior configurable	2010-11-25 06:50:45 +09:00
keys-request-key.txt	…
keys.txt	…
kmemcheck.txt	…
kmemleak.txt	…
kobject.txt	…
kprobes.txt	kprobes: Update document about irq disabled state in kprobe handler	2010-10-14 08:55:27 +02:00
kref.txt	…
ldm.txt	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
leds-class.txt	led-class: always implement blinking	2010-11-12 07:55:32 -08:00
leds-lp3944.txt	…
local_ops.txt	…
lockdep-design.txt	…
lockstat.txt	…
logo.gif	…
logo.txt	…
magic-number.txt	…
mca.txt	…
md.txt	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
memory-barriers.txt	…
memory-hotplug.txt	…
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	variable name fix to Documentation/rt-mutex-design.txt	2010-06-05 17:39:09 +02:00
rt-mutex.txt	…
rtc.txt	…
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
sparse.txt	update email address	2010-07-19 10:56:54 +02:00
spinlocks.txt	…
stable_api_nonsense.txt	…
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	…
video-output.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	workqueue: add and use WQ_MEM_RECLAIM flag	2010-10-11 15:20:26 +02:00
zorro.txt	…