Linus Torvalds 597d8c7178 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: (56 commits) sky2: Fix oops in sky2_xmit_frame() after TX timeout Documentation/3c509: document ethtool support af_packet: Don't use skb after dev_queue_xmit() vxge: use pci_dma_mapping_error to test return value netfilter: ebtables: enforce CAP_NET_ADMIN e1000e: fix and commonize code for setting the receive address registers e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value e1000e: perform 10/100 adaptive IFS only on parts that support it e1000e: don't accumulate PHY statistics on PHY read failure e1000e: call pci_save_state() after pci_restore_state() netxen: update version to 4.0.72 netxen: fix set mac addr netxen: fix smatch warning netxen: fix tx ring memory leak tcp: update the netstamp_needed counter when cloning sockets TI DaVinci EMAC: Handle emac module clock correctly. dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips ixgbe: Fix compiler warning about variable being used uninitialized netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq() mv643xx_eth: don't include cache padding in rx desc buffer size ... Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c		2010-01-12 20:53:29 -08:00
..
ABI	USB: power management documentation update	2009-12-23 11:34:09 -08:00
accounting	Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS	2009-09-23 07:39:28 -07:00
acpi	ACPI: support customizing ACPI control methods at runtime	2009-12-11 01:50:08 -05:00
aoe
arm	OMAP: DSS2: Documentation for DSS2	2009-12-09 12:04:34 +02:00
auxdisplay	includecheck fix: Documentation, cfag12864b-example.c	2009-09-24 07:20:57 -07:00
blackfin	Blackfin: add an example showing how to use the gptimers API	2009-12-15 00:15:04 -05:00
block	Documentation: Rename Documentation/DMA-mapping.txt	2010-01-02 10:09:44 -08:00
blockdev	The DRBD driver	2009-10-01 21:17:49 +02:00
cdrom
cgroups	blkio: Documentation	2009-12-03 19:28:53 +01:00
connector	connector: Provide the sender's credentials to the callback	2009-10-02 10:54:01 -07:00
console
cpu-freq	[ACPI/CPUFREQ] Introduce bios_limit per cpu cpufreq sysfs interface	2009-11-24 13:33:34 -05:00
cpuidle
cris
crypto
development-process
device-mapper	dm snapshot: add merge target	2009-12-10 23:52:30 +00:00
DocBook	DocBook: fix ioremap return type	2010-01-02 10:09:44 -08:00
driver-model	Driver core: driver_attribute parameters can often be const*	2009-12-23 11:23:43 -08:00
dvb	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
early-userspace
fault-injection
fb	viafb: documentation update	2009-12-16 07:20:05 -08:00
filesystems	proc: partially revert "procfs: provide stack information for threads"	2010-01-11 09:34:06 -08:00
firmware_class
frv
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-01-11 09:45:55 -08:00
i2c	i2c: Get rid of struct i2c_client_address_data	2009-12-14 21:17:25 +01:00
i2o
ia64	Documentation/: fix warnings from -Wmissing-prototypes in HOSTCFLAGS	2009-09-23 07:39:28 -07:00
ide
infiniband	IB: Fix typo in ipoib.txt	2009-12-09 14:21:36 -08:00
input
ioctl	docs: large update to ioctl-number.txt	2010-01-11 09:34:04 -08:00
isdn	gigaset: documentation amendments	2009-12-08 20:30:41 -08:00
ja_JP
kbuild	kbuild: generate modules.builtin	2009-12-12 13:08:16 +01:00
kdump
ko_KR
kvm	KVM: x86: Extend KVM_SET_VCPU_EVENTS with selective updates	2009-12-27 13:36:33 -02:00
laptops	thinkpad-acpi: update volume subdriver documentation	2009-12-26 22:37:58 -05:00
lguest	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
m68k
make
mips
misc-devices	ad525x_dpot: new driver for AD525x digital potentiometers	2009-12-15 08:53:25 -08:00
mn10300
mtd
namespaces
netlabel
networking	Documentation/3c509: document ethtool support	2010-01-11 15:53:45 -08:00
parisc
PCI	Documentation: Rename Documentation/DMA-mapping.txt	2010-01-02 10:09:44 -08:00
pcmcia	pcmcia: remove now-defunct cs_error, pcmcia_error_{func,ret}	2009-11-09 08:30:06 +01:00
power	PM: Runtime PM documentation update	2009-12-22 20:43:40 +01:00
powerpc	Merge commit 'kumar/next' into merge	2009-12-21 09:30:42 +11:00
pps
prctl
RCU	rcu: Add synchronize_srcu_expedited() to the documentation	2009-10-26 09:40:31 +01:00
s390
scheduler
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
serial	tty: docs: serial/tty, add to ldisc methods	2009-12-11 15:18:05 -08:00
sh
sound	ALSA: Fix a typo in Procfile.txt	2009-12-26 18:37:44 +01:00
sparc
spi	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
sysctl	doc: Add documentation for bootloader_{type,version}	2009-12-11 14:28:56 -08:00
telephony
thermal	thermal: add sanity check for the passive attribute	2009-11-05 18:18:10 -05:00
timers	fix URL in hpet.txt	2009-11-09 09:40:54 +01:00
trace	Documentation: update ring-buffer-design.txt	2010-01-11 09:34:07 -08:00
uml
usb	USB: power management documentation update	2009-12-23 11:34:09 -08:00
video4linux	V4L/DVB (13651): sh_mobile_ceu_camera: document the scaling and cropping algorithm	2009-12-16 09:27:20 -02:00
vm	HWPOISON: Use correct name for MADV_HWPOISON in documentation	2009-12-16 12:20:00 +01: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
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
cachetlb.txt
Changes	netfilter: xtables: document minimal required version	2009-12-14 14:52:10 +01:00
CodingStyle
cpu-hotplug.txt	cpumask: don't recommend set_cpus_allowed hack in Documentation/cpu-hotplug.txt	2009-12-17 11:43:29 +10:30
cpu-load.txt
cputopology.txt	Documentation: ABI: /sys/devices/system/cpu/cpu#/ topology files	2009-10-30 14:59:52 -07:00
credentials.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt	ieee1394: update URLs in debugging-via-ohci1394.txt	2009-10-03 09:28:11 +02:00
dell_rbu.txt
devices.txt
DMA-API.txt
DMA-attributes.txt
DMA-ISA-LPC.txt
dmaengine.txt
dontdiff	dontdiff: add generated	2009-12-12 13:08:13 +01:00
dynamic-debug-howto.txt
edac.txt	fix typos/grammos in Documentation/edac.txt	2009-12-04 15:39:53 +01:00
eisa.txt
email-clients.txt
feature-removal-schedule.txt	Merge branch 'asus' into release	2009-12-15 22:34:48 -05:00
flexible-arrays.txt	Update flex_arrays.txt	2009-10-15 07:25:20 -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: add support for changing value polarity in sysfs	2009-12-16 07:20:01 -08:00
highuid.txt
HOWTO
hw_random.txt
initrd.txt
intel_txt.txt
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	Documentation: fix ioremap return type	2010-01-02 10:09:44 -08:00
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	documentation: update kernel-doc-nano-HOWTO information	2010-01-11 09:34:07 -08:00
kernel-docs.txt
kernel-parameters.txt	ACPI: introduce kernel parameter acpi_sleep=sci_force_enable	2009-12-30 18:32:01 -05:00
keys-request-key.txt
keys.txt
kmemcheck.txt
kmemleak.txt
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
leds-lp3944.txt
local_ops.txt
lockdep-design.txt
lockstat.txt	lockstat: Add usage info to Documentation/lockstat.txt	2009-12-06 13:20:02 +01:00
logo.gif
logo.txt
magic-number.txt
Makefile
ManagementStyle
mca.txt
md.txt	md: add 'recovery_start' per-device sysfs attribute	2009-12-14 12:58:57 +11:00
memory-barriers.txt
memory-hotplug.txt	mm: add numa node symlink for memory section in sysfs	2009-12-15 08:53:17 -08:00
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	nommu: fix malloc performance by adding uninitialized flag	2009-12-15 08:53:24 -08:00
numastat.txt	mm: fix NUMA accounting in numastat.txt	2009-09-22 07:17:39 -07:00
oops-tracing.txt	docs: Describe the 'C' taint flag in oops-tracing.txt	2009-11-09 09:40:56 +01:00
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: 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	SLOW_WORK: Move slow_work's proc file to debugfs	2009-12-01 08:20:31 -08:00
SM501.txt
Smack.txt
sparse.txt
spinlocks.txt	Documentation: rw_lock lessons learned	2009-12-14 09:46:56 -08:00
stable_api_nonsense.txt
stable_kernel_rules.txt	Doc/stable rules: add new cherry-pick logic	2009-12-23 11:23:43 -08:00
SubmitChecklist	doc: SubmitChecklist, add ioctls, remove OSDL reference	2009-12-16 07:20:06 -08:00
SubmittingDrivers
SubmittingPatches	docs: update patch size in SubmittingPatches	2009-10-01 16:11:12 -07:00
svga.txt
sysfs-rules.txt
sysrq.txt
tomoyo.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
vgaarbiter.txt	vgaarbiter: fix a typo in the vgaarbiter Documentation	2009-12-16 11:28:58 -08:00
video-output.txt
volatile-considered-harmful.txt
voyager.txt
zorro.txt