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
DocBook	DocBook: fix ioremap return type	2010-01-02 10:09:44 -08:00
PCI	Documentation: Rename Documentation/DMA-mapping.txt	2010-01-02 10:09:44 -08:00
RCU	…
accounting	…
acpi	…
aoe	…
arm	…
auxdisplay	…
blackfin	…
block	Documentation: Rename Documentation/DMA-mapping.txt	2010-01-02 10:09:44 -08:00
blockdev	…
cdrom	…
cgroups	…
connector	…
console	…
cpu-freq	…
cpuidle	…
cris	…
crypto	…
development-process	…
device-mapper	…
driver-model	Driver core: driver_attribute parameters can often be const*	2009-12-23 11:23:43 -08:00
dvb	…
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	…
i2o	…
ia64	…
ide	…
infiniband	…
input	…
ioctl	docs: large update to ioctl-number.txt	2010-01-11 09:34:04 -08:00
isdn	…
ja_JP	…
kbuild	…
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	…
m68k	…
make	…
mips	…
misc-devices	…
mn10300	…
mtd	…
namespaces	…
netlabel	…
networking	Documentation/3c509: document ethtool support	2010-01-11 15:53:45 -08:00
parisc	…
pcmcia	…
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	…
s390	…
scheduler	…
scsi	…
serial	…
sh	…
sound	ALSA: Fix a typo in Procfile.txt	2009-12-26 18:37:44 +01:00
sparc	…
spi	…
sysctl	…
telephony	…
thermal	…
timers	…
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	…
vm	…
w1	…
watchdog	…
wimax	…
x86	…
zh_CN	…
00-INDEX	…
BUG-HUNTING	…
Changes	…
CodingStyle	…
DMA-API.txt	…
DMA-ISA-LPC.txt	…
DMA-attributes.txt	…
HOWTO	…
IO-mapping.txt	Documentation: fix ioremap return type	2010-01-02 10:09:44 -08:00
IPMI.txt	…
IRQ-affinity.txt	…
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	…
ManagementStyle	…
SAK.txt	…
SELinux.txt	…
SM501.txt	…
SecurityBugs	…
Smack.txt	…
SubmitChecklist	doc: SubmitChecklist, add ioctls, remove OSDL reference	2009-12-16 07:20:06 -08:00
SubmittingDrivers	…
SubmittingPatches	…
VGA-softcursor.txt	…
applying-patches.txt	…
atomic_ops.txt	…
bad_memory.txt	…
basic_profiling.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
cachetlb.txt	…
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	…
credentials.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	…
devices.txt	…
dmaengine.txt	…
dontdiff	…
dynamic-debug-howto.txt	…
edac.txt	…
eisa.txt	…
email-clients.txt	…
feature-removal-schedule.txt	…
flexible-arrays.txt	…
futex-requeue-pi.txt	…
gcov.txt	…
gpio.txt	gpiolib: add support for changing value polarity in sysfs	2009-12-16 07:20:01 -08:00
highuid.txt	…
hw_random.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.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	…
ldm.txt	…
leds-class.txt	…
leds-lp3944.txt	…
local_ops.txt	…
lockdep-design.txt	…
lockstat.txt	…
logo.gif	…
logo.txt	…
magic-number.txt	…
mca.txt	…
md.txt	…
memory-barriers.txt	…
memory-hotplug.txt	…
memory.txt	…
mono.txt	…
mutex-design.txt	…
nmi_watchdog.txt	…
nommu-mmap.txt	…
numastat.txt	…
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	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rt-mutex-design.txt	…
rt-mutex.txt	…
rtc.txt	…
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
slow-work.txt	…
sparse.txt	…
spinlocks.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	Doc/stable rules: add new cherry-pick logic	2009-12-23 11:23:43 -08:00
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	…
tomoyo.txt	…
unaligned-memory-access.txt	…
unicode.txt	…
unshare.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	…