Linus Torvalds 402168cee1 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: (37 commits) sky2: Avoid races in sky2_down drivers/net/mlx4: Adjust constant drivers/net: Move a dereference below a NULL test drivers/net: Move a dereference below a NULL test connector: maintainer/mail update. USB host CDC Phonet network interface driver macsonic, jazzsonic: fix oops on module unload macsonic: move probe function to .devinit.text can: switch carrier on if device was stopped while in bus-off state can: restart device even if dev_alloc_skb() fails can: sja1000: remove duplicated includes New device ID for sc92031 [1088:2031] 3c589_cs: re-initialize the multicast in the tc589_reset Fix error return for setsockopt(SO_TIMESTAMPING) netxen: fix thermal check and shutdown netxen: fix deadlock on dev close netxen: fix context deletion sequence net: Micrel KS8851 SPI network driver tcp: Use correct peer adr when copying MD5 keys tcp: Fix MD5 signature checking on IPv4 mapped sockets ...		2009-07-22 09:49:58 -07:00
..
ABI	Merge git://git.infradead.org/mtd-2.6	2009-06-22 16:56:22 -07:00
accounting	Documentation/accounting/getdelays.c intialize the variable before using it	2009-06-16 19:47:51 -07:00
acpi
aoe
arm	[ARM] S3C24XX: GPIO: Change to macros for GPIO numbering	2009-05-18 16:26:03 +01:00
auxdisplay
blackfin
block	Trivial typo fixes in Documentation/block/data-integrity.txt.	2009-07-01 10:56:25 +02:00
blockdev
cdrom	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
cgroups	cpusets: document adding/removing cpus to cpuset elaborately	2009-06-30 18:56:01 -07:00
connector	connector: maintainer/mail update.	2009-07-21 12:43:51 -07:00
console
cpu-freq	[CPUFREQ] minor correction to cpu-freq documentation	2009-06-15 11:49:42 -04:00
cpuidle
cris
crypto
development-process	docs: Encourage better changelogs in the development process document	2009-06-04 10:32:49 -06:00
device-mapper	dm raid1: add userspace log	2009-06-22 10:12:35 +01:00
DocBook	mac80211: fix docbook	2009-07-08 15:24:28 -04:00
driver-model	driver model: fix show/store prototypes in doc.	2009-07-12 13:02:10 -07:00
dvb	V4L/DVB (12206): get_dvb_firmware: Correct errors in MPC718 firmware extraction logic	2009-07-05 19:21:49 -03:00
early-userspace
fault-injection	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
fb	Documentation/fb/vesafb.txt: fix typo	2009-06-16 19:47:58 -07:00
filesystems	update Documentation/filesystems/Locking	2009-06-24 08:15:25 -04:00
firmware_class	driver core: fix documentation of request_firmware_nowait	2009-06-15 21:30:24 -07:00
frv
hwmon	hwmon: (f71882fg) Add support for the F71858F	2009-06-15 18:39:52 +02:00
i2c	i2c: Add a sysfs interface to instantiate devices	2009-06-19 16:58:20 +02:00
i2o
ia64
ide	ide: preserve Host Protected Area by default (v2)	2009-06-07 13:52:52 +02:00
infiniband
input	Merge commit 'v2.6.30' into next	2009-06-11 01:58:01 -07:00
ioctl	LinuxPPS: core support	2009-06-18 13:04:04 -07:00
isdn	isdn: clean up documentation index	2009-06-20 01:10:38 -07:00
ja_JP	block: rename CONFIG_LBD to CONFIG_LBDAF	2009-06-19 08:08:50 +02:00
kbuild	kconfig: resort the documentation of the environment variables	2009-06-09 22:37:47 +02:00
kdump	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
ko_KR
laptops	Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release	2009-06-24 01:19:50 -04:00
lguest	lguest: add support for indirect ring entries	2009-06-12 22:27:13 +09:30
m68k
make
mips
misc-devices
mn10300	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
mtd	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
namespaces
netlabel
networking	Update Andreas Koensgen's email address	2009-07-17 10:07:12 -07:00
parisc
PCI	PCI AER: software error injection	2009-06-16 14:30:14 -07:00
pcmcia
power	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
powerpc	Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds	2009-06-28 11:02:32 -07:00
pps	LinuxPPS: core support	2009-06-18 13:04:04 -07:00
prctl
RCU	netfilter: nf_conntrack: nf_conntrack_alloc() fixes	2009-07-16 14:03:40 +02:00
s390	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
scheduler	sched: Documentation/sched-rt-group: Fix style issues & bump version	2009-06-21 13:12:46 +02:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-06-17 09:50:44 -07:00
serial
sh
sound	ALSA: hda - Fix support for Samsung P50 with AD1986A codec	2009-06-24 14:14:34 +02:00
sparc
spi	spi: new spi->mode bits	2009-06-30 18:56:00 -07:00
sysctl	vmscan: properly account for the number of page cache pages zone_reclaim() can reclaim	2009-06-16 19:47:45 -07:00
telephony
thermal
timers	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
trace	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
uml
usb	trivial: usb: fix missing space typo in doc	2009-06-12 18:01:51 +02:00
video4linux	V4L/DVB (12138): em28xx: add support for Silvercrest Webcam	2009-07-05 14:30:05 -03:00
vm	Documentation/vm/Makefile: don't try to build slqbinfo	2009-06-17 09:45:46 -07:00
w1
watchdog	[WATCHDOG] hpwdt: Add NMI priority option	2009-06-23 07:13:45 +00:00
wimax
x86	Doc: move Documentation/exception.txt into x86 subdir	2009-07-10 19:10:32 -07:00
zh_CN
00-INDEX
applying-patches.txt
atomic_ops.txt	Documentation/atomic_ops.txt: fix sample code	2009-06-16 19:47:52 -07:00
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
bt8xxgpio.txt
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	trivial: fix typo milisecond/millisecond for documentation and source comments.	2009-06-12 18:01:46 +02:00
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
credentials.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt	trivial: Documentation/dell_rbu.txt: fix typos	2009-06-12 18:01:50 +02:00
devices.txt
DMA-API.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
DMA-attributes.txt
DMA-ISA-LPC.txt
DMA-mapping.txt
dmaengine.txt
dontdiff
dynamic-debug-howto.txt
edac.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
eisa.txt
email-clients.txt
feature-removal-schedule.txt	[CPUFREQ] Mark policy_rwsem as going static in cpufreq.c wont be exported	2009-07-06 21:38:28 -04:00
futex-requeue-pi.txt	futex: add requeue-pi documentation	2009-05-09 07:12:50 +02:00
gcov.txt	gcov: fix documentation	2009-06-30 18:55:59 -07:00
gpio.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
highuid.txt
HOWTO
hw_random.txt
ics932s401
initrd.txt
Intel-IOMMU.txt
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: restrict syntax for private: and public:	2009-05-02 15:36:10 -07:00
kernel-docs.txt
kernel-parameters.txt	Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-07-10 14:25:59 -07:00
keys-request-key.txt
keys.txt
kmemcheck.txt	kmemcheck: add the kmemcheck documentation	2009-06-13 14:27:20 +02:00
kmemleak.txt	kmemleak: Do not trigger a scan when reading the debug/kmemleak file	2009-06-26 17:38:27 +01:00
kobject.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
kprobes.txt	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
kref.txt
ldm.txt
leds-class.txt
leds-lp3944.txt	leds: LED driver for National Semiconductor LP3944 Funlight Chip	2009-06-23 20:21:38 +01:00
local_ops.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
lockdep-design.txt	locking: Documentation: lockdep-design.txt, fix note of state bits	2009-04-26 18:21:24 +02:00
lockstat.txt
logo.gif	Revert "linux.conf.au 2009: Tuz"	2009-04-27 12:00:27 -07:00
logo.txt	Revert "linux.conf.au 2009: Tuz"	2009-04-27 12:00:27 -07:00
magic-number.txt
Makefile
ManagementStyle
markers.txt
mca.txt
md.txt
memory-barriers.txt	sched: Document memory barriers implied by sleep/wake-up primitives	2009-04-29 14:15:55 +02:00
memory-hotplug.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
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	trivial: rbtree.txt: fix rb_entry() parameters in sample code	2009-06-12 18:01:47 +02:00
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
SAK.txt
SecurityBugs
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
slow-work.txt
SM501.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
svga.txt
sysfs-rules.txt	Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense	2009-05-08 19:22:20 -07:00
sysrq.txt
tomoyo.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
video-output.txt
volatile-considered-harmful.txt
voyager.txt
zorro.txt