Linus Torvalds 5587481e92 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: (40 commits) ethoc: limit the number of buffers to 128 ethoc: use system memory as buffer ethoc: align received packet to make IP header at word boundary ethoc: fix buffer address mapping ethoc: fix typo to compute number of tx descriptors au1000_eth: Duplicate test of RX_OVERLEN bit in update_rx_stats() netxen: Fix Unlikely(x) > y pasemi_mac: ethtool get settings fix add maintainer for network drop monitor kernel service tg3: Fix phylib locking strategy rndis_host: support ETHTOOL_GPERMADDR ipv4: arp_notify address list bug gigaset: add kerneldoc comments gigaset: correct debugging output selection gigaset: improve error recovery gigaset: fix device ERROR response handling gigaset: announce if built with debugging gigaset: handle isoc frame errors more gracefully gigaset: linearize skb gigaset: fix reject/hangup handling ...		2009-10-08 11:59:30 -07:00
..
ABI	cciss: Add usage_count attribute to each logical drive in /sys	2009-10-01 21:15:44 +02:00
accounting	Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS	2009-09-23 07:39:28 -07:00
acpi
aoe
arm	ARM: 5738/1: Correct TCM documentation	2009-10-01 16:26:16 +01:00
auxdisplay	includecheck fix: Documentation, cfag12864b-example.c	2009-09-24 07:20:57 -07:00
blackfin
block	Trivial typo fixes in Documentation/block/data-integrity.txt.	2009-07-01 10:56:25 +02:00
blockdev
cdrom
cgroups	cgroups: update documentation of cgroups tasks and procs files	2009-10-08 07:36:39 -07:00
connector	connector: Provide the sender's credentials to the callback	2009-10-02 10:54:01 -07:00
console
cpu-freq	[CPUFREQ] update Doc for cpuinfo_cur_freq and scaling_cur_freq	2009-09-01 12:45:09 -04:00
cpuidle
cris
crypto	async_tx: add support for asynchronous RAID6 recovery operations	2009-08-29 19:09:27 -07:00
development-process
device-mapper	dm raid1: add userspace log	2009-06-22 10:12:35 +01:00
DocBook	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-09-22 07:51:45 -07:00
driver-model	driver model: fix show/store prototypes in doc.	2009-07-12 13:02:10 -07:00
dvb	V4L/DVB (12902): Documentation: synchronize documentation for Technisat cards	2009-09-19 00:14:32 -03:00
early-userspace
fault-injection
fb	matroxfb: make CONFIG_FB_MATROX_MULTIHEAD=y mandatory	2009-09-23 07:39:56 -07:00
filesystems	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4	2009-09-30 09:32:30 -07:00
firmware_class
frv
hwmon	ltc4215/ltc4245: Discard obsolete detect methods	2009-10-04 22:53:42 +02:00
i2c	i2c: Minor documentation update	2009-10-04 22:53:45 +02:00
i2o
ia64	Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS	2009-09-23 07:39:28 -07:00
ide
infiniband
input	Input: add new driver for Sentelic Finger Sensing Pad	2009-08-19 21:46:09 -07:00
ioctl	drivers/char/uv_mmtimer.c: add memory mapped RTC driver for UV	2009-09-24 07:21:03 -07:00
isdn	Documentation: expand isdn/INTERFACE.CAPI document	2009-10-06 22:20:51 -07:00
ja_JP	block: rename CONFIG_LBD to CONFIG_LBDAF	2009-06-19 08:08:50 +02:00
kbuild	kbuild: introduce ld-option	2009-09-20 12:27:42 +02:00
kdump
ko_KR
kvm	KVM: Document KVM_CAP_IRQCHIP	2009-09-10 10:46:55 +03:00
laptops	Merge branch 'thinkpad-2.6.32-part2' into release	2009-09-26 01:08:55 -04:00
lguest	lguest: don't force VIRTIO_F_NOTIFY_ON_EMPTY	2009-09-23 22:26:47 +09:30
m68k
make
mips
misc-devices	max6875: Discard obsolete detect method	2009-10-04 22:53:41 +02:00
mn10300
mtd
namespaces
netlabel
networking	pktgen: Fix multiqueue handling	2009-10-04 21:08:54 -07:00
parisc
PCI	PCI: document PCIe fundamental reset interfaces	2009-09-09 13:29:38 -07:00
pcmcia	Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS	2009-09-23 07:39:28 -07:00
power	Merge git://git.infradead.org/battery-2.6	2009-09-23 10:11:08 -07:00
powerpc	Merge git://git.infradead.org/mtd-2.6	2009-09-23 10:07:49 -07:00
pps	LinuxPPS: core support	2009-06-18 13:04:04 -07:00
prctl
RCU	rcu: Remove CONFIG_PREEMPT_RCU	2009-08-23 10:32:40 +02:00
s390	[S390] s390dbf: Add description for usage of "%s" in sprintf events	2009-09-11 10:29:53 +02:00
scheduler	sched: Documentation/sched-rt-group: Fix style issues & bump version	2009-06-21 13:12:46 +02:00
scsi	trivial: fix typos "man[ae]g?ment" -> "management"	2009-09-21 15:14:56 +02:00
serial
sh
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2009-10-03 11:25:30 -07:00
sparc
spi	spi: fix spelling of `automatically' in documentation	2009-09-23 07:39:44 -07:00
sysctl	Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6	2009-09-24 07:53:22 -07:00
telephony
thermal
timers
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-09-22 07:51:45 -07:00
uml
usb	USB: Fix sysfs paths in documentation	2009-09-23 06:46:41 -07:00
video4linux	Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS	2009-09-23 07:39:28 -07:00
vm	page-types: add hwpoison/unpoison feature	2009-10-08 07:36:39 -07: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
x86	USB: ehci-dbgp,documentation: Documentation updates for ehci-dbgp	2009-09-23 06:46:39 -07:00
zh_CN
00-INDEX	Bluetooth: Add documentation for Marvell Bluetooth driver	2009-08-22 14:25:32 -07:00
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt	Bluetooth: Add documentation for Marvell Bluetooth driver	2009-08-22 14:25:32 -07:00
BUG-HUNTING
c2port.txt
cachetlb.txt
Changes	Documentation/Changes: perl is needed to build the kernel	2009-06-18 13:03:46 -07:00
CodingStyle
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
credentials.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt
DMA-API.txt
DMA-attributes.txt
DMA-ISA-LPC.txt
DMA-mapping.txt
dmaengine.txt
dontdiff	sparc: Kill PROM console driver.	2009-09-15 17:04:38 -07:00
dynamic-debug-howto.txt
edac.txt
eisa.txt
email-clients.txt
feature-removal-schedule.txt	hwmon: Delete deprecated FSC drivers	2009-09-23 22:59:42 +02:00
flexible-arrays.txt	Document the flex_array library.	2009-09-10 14:33:36 -06:00
futex-requeue-pi.txt
gcov.txt	trivial: fix typo in CONFIG_DEBUG_FS in gcov doc	2009-09-21 15:14:56 +02:00
gpio.txt	gpiolib: allow poll() on value	2009-09-23 07:39:48 -07:00
highuid.txt
HOWTO
hw_random.txt
ics932s401
initrd.txt
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.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	kernel-doc: allow multi-line declaration purpose descriptions	2009-09-18 09:48:52 -07:00
kernel-docs.txt
kernel-parameters.txt	x86: earlyprintk: Fix regression to handle serial,ttySn as 1 arg	2009-10-01 10:34:16 +02:00
keys-request-key.txt
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
kprobes.txt
kref.txt	kref: double kref_put() in my_data_handler()	2009-09-18 09:48:52 -07:00
ldm.txt
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
lockdep-design.txt	lockdep: Fix typos in documentation	2009-08-07 12:03:46 +02:00
lockstat.txt
logo.gif
logo.txt
magic-number.txt
Makefile
ManagementStyle
mca.txt
md.txt
memory-barriers.txt
memory-hotplug.txt
memory.txt	Documentation/memory.txt: remove some very outdated recommendations	2009-09-22 07:17:26 -07:00
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt	mm: fix NUMA accounting in numastat.txt	2009-09-22 07:17:39 -07:00
oops-tracing.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt
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
rt-mutex-design.txt
rt-mutex.txt
rtc.txt	rtc: add boot_timesource sysfs attribute	2009-09-23 07:39:46 -07:00
SAK.txt
SecurityBugs
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
slow-work.txt
SM501.txt
Smack.txt
sparse.txt
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
SubmitChecklist	block: rename CONFIG_LBD to CONFIG_LBDAF	2009-06-19 08:08:50 +02:00
SubmittingDrivers
SubmittingPatches	docs: update patch size in SubmittingPatches	2009-10-01 16:11:12 -07:00
svga.txt
sysfs-rules.txt
sysrq.txt	sysrq, kdump: make sysrq-c consistent	2009-07-29 19:10:36 -07:00
tomoyo.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
vgaarbiter.txt	PCI/VGA: add VGA arbitration documentation	2009-09-09 13:29:42 -07:00
video-output.txt
volatile-considered-harmful.txt
voyager.txt
zorro.txt